diff --git a/.travis.yml b/.travis.yml
index 501e58f..8c0da69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:
 matrix:
     include:
         - os: linux
-          rust: 1.34.2
+          rust: 1.35
         - os: linux
           rust: stable
         - os: osx
diff --git a/src/bin/qrencode.rs b/src/bin/qrencode.rs
index 4837828..db4abc7 100644
--- a/src/bin/qrencode.rs
+++ b/src/bin/qrencode.rs
@@ -1,8 +1,12 @@
 use std::env;
 
 pub fn main() {
-    let arg = env::args().nth(1).unwrap();
-    let code = qrcode::QrCode::new(arg.as_bytes()).unwrap();
+    if env::args().len() == 2 {
+        let arg = env::args().nth(1).unwrap();
+        let code = qrcode::QrCode::new(arg.as_bytes()).unwrap();
 
-    print!("{}", code.render().dark_color("\x1b[7m  \x1b[0m").light_color("\x1b[49m  \x1b[0m").build());
+        println!("{}", code.render().dark_color("\x1b[7m  \x1b[0m").light_color("\x1b[49m  \x1b[0m").build());
+    } else {
+        println!("Usage: {} INPUT_TEXT", env::args().nth(0).unwrap());
+    }
 }
diff --git a/src/lib.rs b/src/lib.rs
index b748659..bef057f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -325,7 +325,7 @@ mod image_tests {
     fn test_annex_i_qr_as_image() {
         let code = QrCode::new(b"01234567").unwrap();
         let image = code.render::<Luma<u8>>().build();
-        let expected = load_from_memory(include_bytes!("test_annex_i_qr_as_image.png")).unwrap().to_luma();
+        let expected = load_from_memory(include_bytes!("test_annex_i_qr_as_image.png")).unwrap().to_luma8();
         assert_eq!(image.dimensions(), expected.dimensions());
         assert_eq!(image.into_raw(), expected.into_raw());
     }
@@ -339,7 +339,7 @@ mod image_tests {
             .dark_color(Rgb([128, 0, 0]))
             .light_color(Rgb([255, 255, 128]))
             .build();
-        let expected = load_from_memory(include_bytes!("test_annex_i_micro_qr_as_image.png")).unwrap().to_rgb();
+        let expected = load_from_memory(include_bytes!("test_annex_i_micro_qr_as_image.png")).unwrap().to_rgb8();
         assert_eq!(image.dimensions(), expected.dimensions());
         assert_eq!(image.into_raw(), expected.into_raw());
     }