diff --git a/src/SparklePony.cs b/src/SparklePony.cs
index 320ddd54..521e034f 100644
--- a/src/SparklePony.cs
+++ b/src/SparklePony.cs
@@ -71,7 +71,7 @@ public class SparklePony {
 	}
 
 	public static void ShowHelp () {
-		Console.WriteLine ("Usage: mono SparklePony.exe [OPTION]...");
+		Console.WriteLine ("Usage: sparklepony [start|stop] [OPTION]...");
 		Console.WriteLine ("Sync Collaboration folder with remote repositories.");
 		Console.WriteLine ("");
 		Console.WriteLine ("Arguments:");
diff --git a/src/sparklepony b/src/sparklepony
index 5ee39fa5..b6a9d0e4 100644
--- a/src/sparklepony
+++ b/src/sparklepony
@@ -10,7 +10,7 @@ if [[ "$1" == "start" ]]; then
 		echo -n "Starting SparklePony..."
 
 		# Start SparklePony in the background and save the pid
-		mono /usr/local/share/sparklepony/SparklePony.exe &
+		mono /usr/local/share/sparklepony/SparklePony.exe $2 &
 		PID=$!
 		echo $PID > /tmp/sparklepony/sparklepony.pid
 		echo " Done."
@@ -27,3 +27,7 @@ if [[ "$1" == "stop" ]]; then
 		echo "SparklePony isn't running."
 	fi
 fi
+
+if [[ "$1" == "--help" ]]; then
+		mono /usr/local/share/sparklepony/SparklePony.exe --help
+fi