diff --git a/mergeUpstream.sh b/mergeUpstream.sh
new file mode 100755
index 0000000..8e75278
--- /dev/null
+++ b/mergeUpstream.sh
@@ -0,0 +1,15 @@
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd "$basedir/$1/.."
+    git add $1
+}
+
+update Waterfall
+
+# Update submodules
+git submodule update --recursive