diff --git a/makedmg.sh b/makedmg.sh
index a7a3ccc..aceb080 100644
--- a/makedmg.sh
+++ b/makedmg.sh
@@ -15,28 +15,28 @@ else
     OUTPUT=$1
     TITLE=$2
     CONTENTDIR=$3
-    FILESIZE=`du -sm ${CONTENTDIR} | cut -f1`
-    FILESIZE=`expr ${FILESIZE} + 5`
-    USER=`whoami`
+    FILESIZE=$(du -sm "${CONTENTDIR}" | cut -f1)
+    FILESIZE=$(("${FILESIZE}" + 5))
+    USER=$(whoami)
     TMPDIR="/tmp/dmgdir"
 
-    if [ ${USER} != "root" ]; then
+    if [ "${USER}" != "root" ]; then
         echo "$0 must be run as root!"
     else
         echo "Creating DMG File..."
-        dd if=/dev/zero of=${OUTPUT} bs=1M count=$FILESIZE
-        mkfs.hfsplus -v "${TITLE}" ${OUTPUT}
+        dd if=/dev/zero of="${OUTPUT}" bs=1M count=$FILESIZE
+        mkfs.hfsplus -v "${TITLE}" "${OUTPUT}"
 
         echo "Mounting DMG File..."
         mkdir -p ${TMPDIR}
-        mount -t hfsplus -o loop ${OUTPUT} ${TMPDIR}
+        mount -t hfsplus -o loop "${OUTPUT}" "${TMPDIR}"
 
         echo "Copying content to DMG File..."
-        cp -R ${CONTENTDIR}/* ${TMPDIR}
+        cp -R "${CONTENTDIR}"/* "${TMPDIR}"
 
         echo "Unmounting DMG File..."
-        umount ${TMPDIR}
-        rm -rf ${TMPDIR}
+        umount "${TMPDIR}"
+        rm -rf "${TMPDIR}"
 
         echo "All Done!"
     fi
diff --git a/uninstall.sh b/uninstall.sh
new file mode 100644
index 0000000..2a2eb4b
--- /dev/null
+++ b/uninstall.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Uninstall Script
+
+if [ "$(which boot2docker)" == "" ]; then
+    echo "boot2docker does not exist on your machine!"
+    exit 1
+fi
+
+if [ "${USER}" != "root" ]; then
+    echo "$0 must be run as root!"
+    exit 2
+fi
+
+echo "Stopping boot2docker processes..."
+boot2docker stop && boot2docker delete
+
+echo "Removing boot2docker executable..."
+rm -f /usr/local/bin/boot2docker
+
+echo "Removing boot2docker ISO and socket files..."
+rm -rf ~/.boot2docker
+rm -rf /usr/local/share/boot2docker
+
+echo "Removing boot2docker SSH keys..."
+rm -f ~/.ssh/id_boot2docker*
+
+echo "Removing boot2docker OSX files..."
+rm -f /private/var/db/receipts/io.boot2docker.*
+rm -f /private/var/db/receipts/io.boot2dockeriso.*
+
+echo "Removing Docker executable..."
+rm -f /usr/local/bin/docker
+
+echo "All Done!"