diff --git a/src/http.rs b/src/http.rs
index 5a92559..025ba7b 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -163,6 +163,7 @@ impl Content {
 			"3gp" => "video/3gpp",
 			"3gp2" => "video/3gpp2",
 			"avi" => "video/x-msvideo",
+			"mov" => "video/mov",
 			"mp4" => "video/mp4",
 			"mpeg" => "video/mpeg",
 			"ogv" => "video/ogv",
diff --git a/src/main.rs b/src/main.rs
index 44f5eb5..eae074b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,13 @@ fn main() {
 	} else {
 		&args[1]
 	};
-	println!("Starting server on {:?}...\n", &host);
+	println!("Starting server on {:?}", &host);
+
+	if args.len() > 2 {
+		env::set_current_dir(&args[2]).expect("root dir specified must be valid path");
+		println!("Set root dir to {}", &args[2]);
+	}
+	println!();
 
 	let listener = TcpListener::bind(host).expect("Could not bind to address");