diff --git a/src/tidler b/src/tidler
index e620c9a..c3c481b 100755
--- a/src/tidler
+++ b/src/tidler
@@ -285,7 +285,14 @@ elif [ "$1" = "download" ]; then
 		downloadTrack
 	fi
 elif [ "$1" = "album" ]; then
-	searchAlbum
+	if [ "$#" -ge 2 ]; then
+		shift
+    	jsw="$*"
+    	searchAlbum "$jsw"
+	else
+		searchAlbum
+	fi
+
 elif [ "$1" = "help" ]; then
 	echo "<MODE>"
 	echo ""
@@ -293,11 +300,11 @@ elif [ "$1" = "help" ]; then
 	echo ""
 	echo "<COMMANDS>"
 	echo ""
-	echo "search {text}-optional -> search any song"
+	echo "search {track_name}-optional -> search any song"
 	echo ""
 	echo "download {song_id}-optional -> download any song"
 	echo ""
-	echo "album -> search and download any album"
+	echo "album {album_name}-> search and download any album"
 	echo ""
 	echo "help -> print this message and exit"
 else