diff --git a/gitflow-feature b/gitflow-feature
index ccc99be..6551b99 100755
--- a/gitflow-feature
+++ b/gitflow-feature
@@ -18,9 +18,12 @@
 }
 
 parse_args() {
-	# TODO: Implement the optional base argument
 	FEATURE="$1"
-	BASE="develop"
+    if [ $# -eq 2 ]; then
+        BASE="$2"
+    else
+        BASE="develop"
+    fi
 	if [ "$FEATURE" = "" ]; then
 		echo "Missing argument <release>."
 		usage