diff --git a/src/config.rs b/src/config.rs
index 7a5cae26..9cf3eb70 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -36,6 +36,22 @@ fn single() {
 
 #[test]
 fn multiple() {
+    assert_eq!(
+        vec!["--plain", "--language=cpp"],
+        get_args_from_str("--plain --language=cpp")
+    );
+}
+
+#[test]
+fn quotes() {
+    assert_eq!(
+        vec!["--theme", "Sublime Snazzy"],
+        get_args_from_str("--theme \"Sublime Snazzy\"")
+    );
+}
+
+#[test]
+fn multi_line() {
     let config = "
     -p
     --style numbers,changes
diff --git a/src/main.rs b/src/main.rs
index 2391e6e8..f1fa5547 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,7 @@ extern crate content_inspector;
 extern crate directories;
 extern crate encoding;
 extern crate git2;
+extern crate shell_words;
 extern crate syntect;
 extern crate wild;