diff --git a/.travis.yml b/.travis.yml
index b40b9f1..4e00a45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
-env:
-  global:
-    - secure: XR0z4IBBGJP6jB0CalptPbGOhAd4HvZb5l35/SPec5sAF+9Z4tQHa7nkg9TkJd6Yf6AVyfDKCA/knVrTzrf883UfWUXMLtr1/Y5kSqEJ+bSGapRAjECHS0+Ts56N6Rqrs8mhXDtl21PtUQnvQDTedm/85VXbHqnX9kgCqVQMtCs=
-
 language: rust
+sudo: false
+matrix:
+  include:
+    - rust: stable
+    - rust: beta
+    - rust: nightly
 
-after_script:
+after_success:
   - cargo doc
-  - mv target/doc doc
-  - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
+  - curl https://raw.githubusercontent.com/kmcallister/travis-doc-upload/master/travis-doc-upload.sh | sh
diff --git a/Cargo.toml b/Cargo.toml
index a607e02..7ee3a26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,5 +12,8 @@ documentation = "http://www.rust-ci.org/kennytm/qrcode-rust/doc/qrcode/index.htm
 [dependencies]
 num = "*"
 
+[features]
+bench = []
+
 [[bin]]
 name = "qrencode"
diff --git a/scripts/id_rsa.enc b/scripts/id_rsa.enc
new file mode 100644
index 0000000..4954ee6
Binary files /dev/null and b/scripts/id_rsa.enc differ
diff --git a/scripts/travis-doc-upload.cfg b/scripts/travis-doc-upload.cfg
new file mode 100644
index 0000000..d30b709
--- /dev/null
+++ b/scripts/travis-doc-upload.cfg
@@ -0,0 +1,3 @@
+PROJECT_NAME=qrcode-rust
+DOCS_REPO=kennytm/qrcode-rust.git
+SSH_KEY_TRAVIS_ID=cbc3a9ac2cf3
diff --git a/src/bits.rs b/src/bits.rs
index c3c8fdb..c940bf9 100644
--- a/src/bits.rs
+++ b/src/bits.rs
@@ -2,7 +2,7 @@
 
 use std::cmp::min;
 
-#[cfg(test)]
+#[cfg(feature="bench")]
 use test::Bencher;
 
 use types::{QrResult, QrError, Mode, EcLevel, Version};
@@ -122,6 +122,7 @@ fn test_push_number() {
                            0b1__0000000]);  // 128
 }
 
+#[cfg(feature="bench")]
 #[bench]
 fn bench_push_splitted_bytes(bencher: &mut Bencher) {
     bencher.iter(|| {
diff --git a/src/lib.rs b/src/lib.rs
index 9412943..a172b95 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,9 +18,9 @@
 //!     }
 //!
 
-#![cfg_attr(test, feature(test))] // Unstable libraries
+#![cfg_attr(feature="bench", feature(test))] // Unstable libraries
 
-#[cfg(test)]
+#[cfg(feature="bench")]
 extern crate test;
 extern crate num;
 
diff --git a/src/optimize.rs b/src/optimize.rs
index 1961ba7..e79a185 100644
--- a/src/optimize.rs
+++ b/src/optimize.rs
@@ -2,7 +2,7 @@
 use std::slice::Iter;
 use types::{Mode, Version};
 
-#[cfg(test)]
+#[cfg(feature="bench")]
 use test::Bencher;
 
 //------------------------------------------------------------------------------
@@ -451,6 +451,7 @@ mod optimize_tests {
 
 }
 
+#[cfg(feature="bench")]
 #[bench]
 fn bench_optimize(bencher: &mut Bencher) {
     use types::Version;