diff --git a/android/dynamicuniformbuffer/AndroidManifest.xml b/android/dynamicuniformbuffer/AndroidManifest.xml
index c4d40df3..ecd1f165 100644
--- a/android/dynamicuniformbuffer/AndroidManifest.xml
+++ b/android/dynamicuniformbuffer/AndroidManifest.xml
@@ -15,6 +15,7 @@
                 android:label="Dynamic uniform buffers"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
+                android:screenOrientation="landscape"                
                 android:configChanges="orientation|screenSize|keyboardHidden">
 			<meta-data android:name="android.app.lib_name" android:value="vulkanDynamicuniformbuffer" />
 			<intent-filter>
diff --git a/android/dynamicuniformbuffer/build.bat b/android/dynamicuniformbuffer/build.bat
deleted file mode 100644
index a0db2ab4..00000000
--- a/android/dynamicuniformbuffer/build.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
-	cd..
-
-	mkdir "assets\shaders\base"
-	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
-	
-	mkdir "assets\shaders\dynamicuniformbuffer"
-	xcopy "..\..\data\shaders\dynamicuniformbuffer\*.spv" "assets\shaders\dynamicuniformbuffer" /Y
-
-	mkdir "res\drawable"
-	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
-
-	call ant debug -Dout.final.file=vulkanDynamicuniformbuffer.apk
-) ELSE (
-	echo error : ndk-build failed with errors!
-	cd..
-)
diff --git a/android/dynamicuniformbuffer/build.py b/android/dynamicuniformbuffer/build.py
new file mode 100644
index 00000000..f74713ca
--- /dev/null
+++ b/android/dynamicuniformbuffer/build.py
@@ -0,0 +1,35 @@
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+APK_NAME = "vulkanDynamicuniformbuffer"
+SHADER_DIR = "dynamicuniformbuffer"
+
+if subprocess.call("ndk-build", shell=True) == 0:   
+    print("Build successful")
+
+    os.makedirs("./assets/shaders/base", exist_ok=True)
+    os.makedirs("./assets/shaders/%s" % SHADER_DIR, exist_ok=True)
+    os.makedirs("./res/drawable", exist_ok=True)
+    
+    # Shaders    
+    # Base
+    for file in glob.glob("../../data/shaders/base/*.spv"):
+        shutil.copy(file, "./assets/shaders/base")    
+    # Sample
+    for file in glob.glob("../../data/shaders/%s/*.spv" % SHADER_DIR):
+        shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR)    
+    # Icon
+    shutil.copy("../../android/images/icon.png", "./res/drawable")      
+
+    if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
+        if len(sys.argv) > 1:
+            if sys.argv[1] == "-deploy":
+                if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
+                    print("Could not deploy to device!")
+    else:
+        print("Error during build process!")
+else:
+    print("Error building project!")
\ No newline at end of file
diff --git a/android/gears/AndroidManifest.xml b/android/gears/AndroidManifest.xml
index deaaf3c3..b06d0c5a 100644
--- a/android/gears/AndroidManifest.xml
+++ b/android/gears/AndroidManifest.xml
@@ -15,6 +15,7 @@
                 android:label="Gears"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
+                android:screenOrientation="landscape"
                 android:configChanges="orientation|screenSize|keyboardHidden">
 			<meta-data android:name="android.app.lib_name" android:value="vulkanGears" />
 			<intent-filter>
diff --git a/android/gears/build.bat b/android/gears/build.bat
deleted file mode 100644
index 366009f8..00000000
--- a/android/gears/build.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
-	echo ndk-build has failed, build cancelled
-	cd..
-
-	mkdir "assets\shaders\base"
-	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
-	
-
-	mkdir "assets\shaders"
-	xcopy "..\..\data\shaders\gears.vert.spv" "assets\shaders" /Y
-	xcopy "..\..\data\shaders\gears.frag.spv" "assets\shaders" /Y
-	
-	mkdir "res\drawable"
-	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
-
-	call ant debug -Dout.final.file=vulkanGears.apk
-) ELSE (
-	echo error : ndk-build failed with errors!
-	cd..
-)
diff --git a/android/gears/build.py b/android/gears/build.py
new file mode 100644
index 00000000..00eecba1
--- /dev/null
+++ b/android/gears/build.py
@@ -0,0 +1,35 @@
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+APK_NAME = "vulkanGears"
+SHADER_DIR = "gears"
+
+if subprocess.call("ndk-build", shell=True) == 0:   
+    print("Build successful")
+
+    os.makedirs("./assets/shaders/base", exist_ok=True)
+    os.makedirs("./assets/shaders/%s" % SHADER_DIR, exist_ok=True)
+    os.makedirs("./res/drawable", exist_ok=True)
+    
+    # Shaders    
+    # Base
+    for file in glob.glob("../../data/shaders/base/*.spv"):
+        shutil.copy(file, "./assets/shaders/base")    
+    # Sample
+    for file in glob.glob("../../data/shaders/%s/*.spv" % SHADER_DIR):
+        shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR)    
+    # Icon
+    shutil.copy("../../android/images/icon.png", "./res/drawable")      
+
+    if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
+        if len(sys.argv) > 1:
+            if sys.argv[1] == "-deploy":
+                if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
+                    print("Could not deploy to device!")
+    else:
+        print("Error during build process!")
+else:
+    print("Error building project!")
\ No newline at end of file
diff --git a/dynamicuniformbuffer/dynamicuniformbuffer.cpp b/dynamicuniformbuffer/dynamicuniformbuffer.cpp
index d711254b..33ddf1d2 100644
--- a/dynamicuniformbuffer/dynamicuniformbuffer.cpp
+++ b/dynamicuniformbuffer/dynamicuniformbuffer.cpp
@@ -208,7 +208,7 @@ public:
 		VulkanExampleBase::submitFrame();
 	}
 
-	void generateTriangle()
+	void generateCube()
 	{
 		// Setup vertices indices for a colored cube
 		std::vector<Vertex> vertices = {
@@ -513,7 +513,7 @@ public:
 	void prepare()
 	{
 		VulkanExampleBase::prepare();
-		generateTriangle();
+		generateCube();
 		setupVertexDescriptions();
 		prepareUniformBuffers();
 		setupDescriptorSetLayout();