diff --git a/docs/getting-started-guides/docker-multinode.md b/docs/getting-started-guides/docker-multinode.md
index d955fa045c4..af7aba677ce 100644
--- a/docs/getting-started-guides/docker-multinode.md
+++ b/docs/getting-started-guides/docker-multinode.md
@@ -54,6 +54,9 @@ Please install Docker 1.6.2 or wait for Docker 1.7.1.
 
 1. You need a machine with docker installed.
 
+There is a [bug](https://github.com/docker/docker/issues/14106) in Docker 1.7.0 that prevents this guide from working correctly.
+Please install Docker 1.6.2 or wait for Docker 1.7.1.
+
 ## Overview
 
 This guide will set up a 2-node Kubernetes cluster, consisting of a _master_ node which hosts the API server and orchestrates work
@@ -78,6 +81,7 @@ it is still useful to use containers for deployment and management, so we create
 The first step in the process is to initialize the master node.
 
 Clone the Kubernetes repo, and run [master.sh](docker-multinode/master.sh) on the master machine with root:
+
 ```sh
 export K8S_VERSION=<your_k8s_version>
 cd kubernetes/cluster/docker-multinode
@@ -92,7 +96,8 @@ See [here](docker-multinode/master.md) for detailed instructions explaination.
 
 Once your master is up and running you can add one or more workers on different machines.
 
-Clone the Kubernetes repo, and run [worker.sh](docker-multinode/work.sh) on the worker machine with root:
+Clone the Kubernetes repo, and run [worker.sh](docker-multinode/worker.sh) on the worker machine with root:
+
 ```sh
 export K8S_VERSION=<your_k8s_version> MASTER_IP=<your_master_ip>
 cd kubernetes/cluster/docker-multinode
diff --git a/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh
index a1473a46454..790262bc3b6 100755
--- a/docs/getting-started-guides/docker-multinode/master.sh
+++ b/docs/getting-started-guides/docker-multinode/master.sh
@@ -21,95 +21,93 @@ set -e
 
 # Make sure docker daemon is running
 if ( ! ps -ef | grep "/usr/bin/docker" | grep -v 'grep' &> /dev/null ); then
-   echo "Docker is not running on this machine!"
-   exit
+    echo "Docker is not running on this machine!"
+    exit 1
 fi
 
 # Make sure k8s version env is properly set
 if [ -z ${K8S_VERSION} ]; then
     echo "Please export K8S_VERSION in your env"
-    exit
+    exit 1
 else
-	echo "k8s version is set to: ${K8S_VERSION}"
+    echo "k8s version is set to: ${K8S_VERSION}"
 fi
 
 
 # Run as root
 if [ "$(id -u)" != "0" ]; then
-  echo >&2 "Please run as root"
-  exit 1
+    echo >&2 "Please run as root"
+    exit 1
 fi
 
 # Check if a command is valid
 command_exists() {
-	command -v "$@" > /dev/null 2>&1
+    command -v "$@" > /dev/null 2>&1
 }
 
 lsb_dist=""
 
 # Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
 detect_lsb() {
-	case "$(uname -m)" in
-	*64)
-		;;
-	*)
-		cat >&2 <<-'EOF'
-		Error: you are not using a 64-bit platform.
-		We currently only support 64-bit platforms.
-		EOF
-		exit 1
-		;;
-	esac
+    case "$(uname -m)" in
+    *64)
+        ;;
+    *)
+        echo "Error: We currently only support 64-bit platforms."       
+        exit 1
+        ;;
+    esac
 
-	if command_exists lsb_release; then
-		lsb_dist="$(lsb_release -si)"
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
-		lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
-		lsb_dist='debian'
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
-		lsb_dist='fedora'
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
-		lsb_dist="$(. /etc/os-release && echo "$ID")"
-	fi
+    if command_exists lsb_release; then
+        lsb_dist="$(lsb_release -si)"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
+        lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
+        lsb_dist='debian'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
+        lsb_dist='fedora'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
+        lsb_dist="$(. /etc/os-release && echo "$ID")"
+    fi
 
-	lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
+    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 }
 
+
 # Start the bootstrap daemon
 bootstrap_daemon() {
-	sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
-
-	sleep 5
+    sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
+    
+    sleep 5
 }
 
 # Start k8s components in containers
 DOCKER_CONF=""
 
 start_k8s(){
-	# Start etcd 
-	docker -H unix:///var/run/docker-bootstrap.sock run --restart=always --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
+    # Start etcd 
+    docker -H unix:///var/run/docker-bootstrap.sock run --restart=always --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
+
+    sleep 5
+    # Set flannel net config
+    docker -H unix:///var/run/docker-bootstrap.sock run --net=host gcr.io/google_containers/etcd:2.0.12 etcdctl set /coreos.com/network/config '{ "Network": "10.1.0.0/16" }'
 
-	sleep 5
-	# Set flannel net config
-	docker -H unix:///var/run/docker-bootstrap.sock run --net=host gcr.io/google_containers/etcd:2.0.12 etcdctl set /coreos.com/network/config '{ "Network": "10.1.0.0/16" }'
-    
     # iface may change to a private network interface, eth0 is for default
     flannelCID=$(docker -H unix:///var/run/docker-bootstrap.sock run --restart=always -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.0 /opt/bin/flanneld -iface="eth0")
-	
-	sleep 8
 
-	# Copy flannel env out and source it on the host
-	docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
-	source subnet.env
+    sleep 8
+
+    # Copy flannel env out and source it on the host
+    docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
+    source subnet.env
 
     # Configure docker net settings, then restart it
-	case "$lsb_dist" in
-		fedora|centos|amzn)
+    case "$lsb_dist" in
+        fedora|centos|amzn)
             DOCKER_CONF="/etc/sysconfig/docker"
         ;;
         ubuntu|debian|linuxmint)
@@ -117,15 +115,15 @@ start_k8s(){
         ;;
     esac
 
-    # use insecure docker registry
-	echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+    # Append the docker opts
+    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 
 
     # sleep a little bit
-	ifconfig docker0 down
+    ifconfig docker0 down
 
     case "$lsb_dist" in
-		fedora|centos|amzn)
+        fedora|centos|amzn)
             yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
         ;;
         ubuntu|debian|linuxmint)
@@ -134,10 +132,10 @@ start_k8s(){
     esac
 
     # sleep a little bit
-	sleep 5
+    sleep 5
 
-	# Start kubelet & proxy, then start master components as pods
-	docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  gcr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=127.0.0.1 --config=/etc/kubernetes/manifests-multi
+    # Start kubelet & proxy, then start master components as pods
+    docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  gcr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=127.0.0.1 --config=/etc/kubernetes/manifests-multi
     docker run -d --net=host --privileged cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube proxy --master=http://127.0.0.1:8080 --v=2   
 }
 
diff --git a/docs/getting-started-guides/docker-multinode/worker.sh b/docs/getting-started-guides/docker-multinode/worker.sh
index 49a5fb1a489..3e24afb8c28 100755
--- a/docs/getting-started-guides/docker-multinode/worker.sh
+++ b/docs/getting-started-guides/docker-multinode/worker.sh
@@ -21,97 +21,94 @@ set -e
 
 # Make sure docker daemon is running
 if ( ! ps -ef | grep "/usr/bin/docker" | grep -v 'grep' &> /dev/null  ); then
-   echo "Docker is not running on this machine!"
-   exit
+    echo "Docker is not running on this machine!"
+    exit 1
 fi
 
 # Make sure k8s version env is properly set
 if [ -z ${K8S_VERSION} ]; then
     echo "Please export K8S_VERSION in your env"
-    exit
+    exit 1
 else
-	echo "k8s version is set to: ${K8S_VERSION}"
+    echo "k8s version is set to: ${K8S_VERSION}"
 fi
 
 
 # Run as root
 if [ "$(id -u)" != "0" ]; then
-  echo >&2 "Please run as root"
-  exit 1
+    echo >&2 "Please run as root"
+    exit 1
 fi
 
 # Make sure master ip is properly set
 if [ -z ${MASTER_IP} ]; then
-        echo "Please export MASTER_IP in your env"
-        exit
+    echo "Please export MASTER_IP in your env"
+    exit 1
 else
-	echo "k8s master is set to: ${MASTER_IP}"
+    echo "k8s master is set to: ${MASTER_IP}"
 fi
 
 # Check if a command is valid
 command_exists() {
-	command -v "$@" > /dev/null 2>&1
+    command -v "$@" > /dev/null 2>&1
 }
 
 lsb_dist=""
 
 # Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
 detect_lsb() {
-	case "$(uname -m)" in
-	*64)
-		;;
-	*)
-		cat >&2 <<-'EOF'
-		Error: you are not using a 64-bit platform.
-		We currently only support 64-bit platforms.
-		EOF
-		exit 1
-		;;
-	esac
+    case "$(uname -m)" in
+    *64)
+        ;;
+    *)
+	echo "Error: We currently only support 64-bit platforms."	    
+	exit 1
+	;;
+    esac
 
-	if command_exists lsb_release; then
-		lsb_dist="$(lsb_release -si)"
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
-		lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
-		lsb_dist='debian'
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
-		lsb_dist='fedora'
-	fi
-	if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
-		lsb_dist="$(. /etc/os-release && echo "$ID")"
-	fi
+    if command_exists lsb_release; then
+        lsb_dist="$(lsb_release -si)"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/lsb-release ]; then
+        lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/debian_version ]; then
+        lsb_dist='debian'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/fedora-release ]; then
+        lsb_dist='fedora'
+    fi
+    if [ -z ${lsb_dist} ] && [ -r /etc/os-release ]; then
+        lsb_dist="$(. /etc/os-release && echo "$ID")"
+    fi
 
-	lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
+    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 }
 
 
 # Start the bootstrap daemon
 bootstrap_daemon() {
-	sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
+    sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
 
-	sleep 5
+    sleep 5
 }
 
 DOCKER_CONF=""
 
 # Start k8s components in containers
 start_k8s() {
-	# Start flannel
-	flannelCID=$(sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --restart=always --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.0 /opt/bin/flanneld --etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
+    # Start flannel
+    flannelCID=$(sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --restart=always --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.0 /opt/bin/flanneld --etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
 
-	sleep 8
+    sleep 8
 
-	# Copy flannel env out and source it on the host
-	sudo docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
-	source subnet.env
+    # Copy flannel env out and source it on the host
+    sudo docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
+    source subnet.env
 
-	# Configure docker net settings, then restart it
-	case "$lsb_dist" in
-		fedora|centos|amzn)
+    # Configure docker net settings, then restart it
+    case "$lsb_dist" in
+        fedora|centos|amzn)
             DOCKER_CONF="/etc/sysconfig/docker"
         ;;
         ubuntu|debian|linuxmint)
@@ -119,12 +116,12 @@ start_k8s() {
         ;;
     esac
 
-	echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 
-	ifconfig docker0 down
+    ifconfig docker0 down
 
     case "$lsb_dist" in
-		fedora|centos)
+        fedora|centos)
             yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
         ;;
         ubuntu|debian|linuxmint)
@@ -132,12 +129,12 @@ start_k8s() {
         ;;
     esac
 
-	# sleep a little bit
-	sleep 5
-
-	# Start kubelet & proxy in container
-	sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://${MASTER_IP}:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=$(hostname -i)
-	sudo docker run -d --net=host --privileged cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2
+    # sleep a little bit
+    sleep 5
+    
+    # Start kubelet & proxy in container
+    sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock  cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube kubelet --api_servers=http://${MASTER_IP}:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=$(hostname -i)
+    sudo docker run -d --net=host --privileged cr.io/google_containers/hyperkube:v${K8S_VERSION} /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2
 
 }
 
@@ -150,4 +147,4 @@ bootstrap_daemon
 echo "Starting k8s ..."
 start_k8s
 
-echo "Worker done!"
\ No newline at end of file
+echo "Worker done!"