diff --git a/Makefile b/Makefile
index 336e5120..c2f82707 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,16 @@
-default:
-	./build.py
+default: mklocal
 
+local: mklocal
+mobile: mkmobile
+
+mklocal:
+	./build.py local
+
+mkmobile:
+	./build.py mobile
+	adb install -r build/mobile/IITC_Mobile-debug.apk
+	adb shell am start -n com.cradle.iitc_mobile/com.cradle.iitc_mobile.IITC_Mobile
 
 clean:
 	ant -f mobile/build.xml clean
+
diff --git a/build.py b/build.py
index 97f808e6..ec04387d 100755
--- a/build.py
+++ b/build.py
@@ -289,6 +289,7 @@ if buildMobile:
 
         if retcode != 0:
             print ("Error: mobile app failed to build. ant returned %d" % retcode)
+            exit(1) # ant may return 256, but python seems to allow only values <256
         else:
             shutil.copy("mobile/bin/IITC_Mobile-%s.apk" % buildMobile, os.path.join(outDir,"IITC_Mobile-%s.apk" % buildMobile) )