diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos
index 88794996..07387f53 100644
--- a/scripts/macos/build-macos
+++ b/scripts/macos/build-macos
@@ -1,23 +1,32 @@
-#!/bin/bash -x -e
+#!/bin/bash -xe
 #
 # Script to build Mac OS X binary snapshots of PS Move API
 # Thomas Perl <m@thp.io>; 2012-09-28
 #
 
 # Determine PSMoveAPI root dir
-export PSMOVEAPI_CHECKOUT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../"
+PSMOVEAPI_CHECKOUT=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ && pwd )
+export PSMOVEAPI_CHECKOUT
 
-export OPENCV_CHECKOUT_DIR=$PSMOVEAPI_CHECKOUT/external/opencv
-export OPENCV_BUILD_DIR=$PSMOVEAPI_CHECKOUT/external/opencv/build
-export OPENCV_INSTALL_DIR=$OPENCV_CHECKOUT_DIR/build/install
+export OPENCV_CHECKOUT_DIR="$PSMOVEAPI_CHECKOUT/external/opencv"
+export OPENCV_BUILD_DIR="$PSMOVEAPI_CHECKOUT/external/opencv/build"
+export OPENCV_INSTALL_DIR="$OPENCV_CHECKOUT_DIR/build/install"
 
 # For parallel builds
 MAKE_ARGS=-j4
 
+# Enter PS Move API directory to call the following git commands in psmoveapi repository
+cd "$PSMOVEAPI_CHECKOUT"
+
 # Git revision identifier
 PSMOVEAPI_REVISION=$(git describe --tags)
+export PSMOVEAPI_REVISION
+
+# Initialize Submodules of PS Move API
+git submodule init
+git submodule update
 
-if [ ! -f $PSMOVEAPI_CHECKOUT/CMakeLists.txt ]; then
+if [ ! -f "$PSMOVEAPI_CHECKOUT/CMakeLists.txt" ]; then
     echo "ERROR: You have to run this script in the PS Move API source root."
     exit 1
 fi
@@ -26,7 +35,7 @@ fi
 # needed for the PS3EYEDriver to access the PSEye
 # otherwise we'd dynamically link against some the Homebrew libusb
 (
-    cd $PSMOVEAPI_CHECKOUT/external/libusb-1.0
+    cd "$PSMOVEAPI_CHECKOUT/external/libusb-1.0"
     export ARCHFLAGS='-arch x86_64'
     export CFLAGS="$CFLAGS $ARCHFLAGS"
     export CXXFLAGS="$CXXFLAGS $ARCHFLAGS"
@@ -35,10 +44,8 @@ fi
     make ${MAKE_ARGS}
 )
 
-cd $PSMOVEAPI_CHECKOUT
-
 # Build OpenCV
-if [ ! -d $OPENCV_INSTALL_DIR ]; then
+if [ ! -d "$OPENCV_INSTALL_DIR" ]; then
     cd external
     if [ ! -d opencv ]; then
 		git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
@@ -80,12 +87,13 @@ if [ ! -d $OPENCV_INSTALL_DIR ]; then
           -DWITH_GSTREAMER=OFF \
           -DWITH_GPHOTO2=OFF \
           -DCMAKE_OSX_ARCHITECTURES="x86_64" \
-          -DCMAKE_INSTALL_PREFIX=$(pwd)/install ..
+          -DCMAKE_INSTALL_PREFIX="$(pwd)/install" ..
     make ${MAKE_ARGS}
     make install
 fi
 
-cd $PSMOVEAPI_CHECKOUT
+# Enter PS Move API directory to build
+cd "$PSMOVEAPI_CHECKOUT"
 
 # Build PS Move API
 rm -rf build
@@ -95,5 +103,5 @@ cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \
       -DPSMOVE_BUILD_TRACKER=ON \
       -DPSMOVE_BUILD_JAVA_BINDINGS=ON \
       -DPSMOVE_BUILD_PROCESSING_BINDINGS=ON \
-      -DOpenCV_DIR=${OPENCV_BUILD_DIR} ..
+      -DOpenCV_DIR="${OPENCV_BUILD_DIR}" ..
 make ${MAKE_ARGS}