diff --git a/stratosphere-dist/src/main/assemblies/bin.xml b/stratosphere-dist/src/main/assemblies/bin.xml
index 26d24f1b3f0e5..0808b944e0a22 100644
--- a/stratosphere-dist/src/main/assemblies/bin.xml
+++ b/stratosphere-dist/src/main/assemblies/bin.xml
@@ -4,7 +4,7 @@
     <id>bin</id>
     <formats>
         <format>dir</format>
-		    <format>tar.gz</format>
+        <format>tar.gz</format>
         <format>zip</format>
     </formats>
 
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-config.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-config.sh
index 40c61d6063f08..e26131a76002f 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-config.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/nephele-config.sh
@@ -21,6 +21,12 @@ DEFAULT_NEPHELE_JM_HEAP=256
 # The default Java heap size for the Nephele Task Manager in MB
 DEFAULT_NEPHELE_TM_HEAP=512
 
+# Optional Nephele parameters
+#NEPHELE_OPTS=""
+
+# Optional Nephele SSH parameters
+#NEPHELE_SSH_OPTS=""
+
 # Resolve links
 this="$0"
 while [ -h "$this" ]; do
@@ -66,10 +72,6 @@ NEPHELE_BIN_DIR=$NEPHELE_ROOT_DIR/bin
 NEPHELE_LIB_DIR=$NEPHELE_ROOT_DIR/lib
 NEPHELE_LOG_DIR=$NEPHELE_ROOT_DIR/log
 
-# calling options 
-NEPHELE_OPTS=""
-#NEPHELE_OPTS=
-
 # arguments for the JVM. Used for job manager and task manager JVMs
 # DO NOT USE FOR MEMORY SETTINGS! Use DEFAULT_NEPHELE_JM_HEAP and
 # DEFAULT_NEPHELE_TM_HEAP for that!
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh
index 2627a8b0b36b6..b48324be056c6 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh
@@ -38,5 +38,5 @@ $NEPHELE_BIN_DIR/nephele-jobmanager.sh start cluster
 while read line
 do
 	HOST=$( extractHostName $line)
-	ssh $NEPELE_E_SSH_OPTS $HOST nohup /bin/bash $NEPHELE_BIN_DIR/nephele-taskmanager.sh start &
+	ssh -n $NEPHELE_SSH_OPTS $HOST -- "nohup /bin/bash $NEPHELE_BIN_DIR/nephele-taskmanager.sh start &"
 done < $HOSTLIST
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh
index 4dddce814e5bc..a71ff82917d49 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh
@@ -38,5 +38,5 @@ $NEPHELE_BIN_DIR/nephele-jobmanager.sh stop
 while read line
 do
 	HOST=$( extractHostName $line)
-	ssh $NEPHELE_SSH_OPTS $HOST nohup /bin/bash $NEPHELE_BIN_DIR/nephele-taskmanager.sh stop &
+	ssh -n $NEPHELE_SSH_OPTS $HOST -- "nohup /bin/bash $NEPHELE_BIN_DIR/nephele-taskmanager.sh stop &"
 done < $HOSTLIST