diff --git a/android-jar/project.properties b/android-jar/project.properties
index 91d2b02..362a0a3 100644
--- a/android-jar/project.properties
+++ b/android-jar/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-22
 android.library=true
diff --git a/android-jar/src/com/mesmotronic/ane/fullscreen/FullScreenContext.java b/android-jar/src/com/mesmotronic/ane/fullscreen/FullScreenContext.java
index 5e55548..e2237d3 100644
--- a/android-jar/src/com/mesmotronic/ane/fullscreen/FullScreenContext.java
+++ b/android-jar/src/com/mesmotronic/ane/fullscreen/FullScreenContext.java
@@ -266,19 +266,10 @@ public void init()
 	public void resetUi()
 	{
 		final View decorView = getDecorView();
-		final Window window = getWindow();
 		
 		decorView.setOnFocusChangeListener(getOnFocusChangeListener());
 		decorView.setOnSystemUiVisibilityChangeListener(null);
 		
-		window.clearFlags
-		(
-			WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN
-			| WindowManager.LayoutParams.FLAG_FULLSCREEN
-			| WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION 
-			| WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-		);
-		
 		init(); 
 		
 		setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
diff --git a/android-jar/src/com/mesmotronic/ane/fullscreen/functions/ShowSystemUiFunction.java b/android-jar/src/com/mesmotronic/ane/fullscreen/functions/ShowSystemUiFunction.java
index 63482fd..65da757 100644
--- a/android-jar/src/com/mesmotronic/ane/fullscreen/functions/ShowSystemUiFunction.java
+++ b/android-jar/src/com/mesmotronic/ane/fullscreen/functions/ShowSystemUiFunction.java
@@ -31,6 +31,7 @@
 package com.mesmotronic.ane.fullscreen.functions;
 
 import android.os.Build;
+import android.view.WindowManager;
 
 import com.adobe.fre.FREContext;
 import com.adobe.fre.FREFunction;
@@ -53,6 +54,13 @@ public FREObject call(FREContext context, FREObject[] args)
 			final FullScreenContext fsc = (FullScreenContext) context;
 			
 			fsc.resetUi();
+			
+			fsc.getWindow().clearFlags
+			(
+				WindowManager.LayoutParams.FLAG_FULLSCREEN
+				| WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION 
+				| WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+			);
 		}
 		catch (Exception e0)
 		{
diff --git a/build/AndroidFullScreen.ane b/build/AndroidFullScreen.ane
index 71f2929..6de73e2 100644
Binary files a/build/AndroidFullScreen.ane and b/build/AndroidFullScreen.ane differ
diff --git a/build/android/fullscreen-ane-jar.jar b/build/android/fullscreen-ane-jar.jar
index 913decc..9b9ad74 100644
Binary files a/build/android/fullscreen-ane-jar.jar and b/build/android/fullscreen-ane-jar.jar differ
diff --git a/build/build.cmd b/build/build.cmd
index 1f2a4e3..c46fb82 100644
--- a/build/build.cmd
+++ b/build/build.cmd
@@ -2,7 +2,7 @@
 
 copy ..\android-jar\bin\fullscreen-ane-jar.jar android
 
-adt ^
+call adt ^
  -package ^
  -target ane ./AndroidFullScreen.ane extension.xml ^
  -swc swc/fullscreen-ane-android.swc ^
diff --git a/build/build.config.example b/build/build.config.example
new file mode 100644
index 0000000..7f046ba
--- /dev/null
+++ b/build/build.config.example
@@ -0,0 +1,7 @@
+name = AndroidFullScreen
+name.jar = fullscreen-ane-jar
+
+flex.sdk = Your path to flex sdk for example i am using D:/programs/FlashDevelop/Apps/ascsdk/17.0.0
+flex.sdk.ext = .bat
+
+android.sdk = Your path to adt for example i am using D:/programs/adt-bundle-windows-x86_64-20131030/sdk/platforms/android-19
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
new file mode 100644
index 0000000..6d76cf3
--- /dev/null
+++ b/build/build.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Air Native Extension Build Scripts" default="all">
+
+    <!-- Config -->
+    <property file="build.config"/>
+
+    <!-- All -->
+    <target name="all" depends="android,swc,package" description="Full build of extension"/>
+
+    <!-- Android -->
+    <target name="android" description="Build Android Library">
+		<delete dir="../temp-java"/>
+		<mkdir dir="../temp-java"/>
+		
+        <echo message="Using Java version ${ant.java.version}."/>
+
+        <javac source="1.6" srcdir="../android-jar/src" destdir="../temp-java" includeantruntime="false">
+			<src path="../android-jar/src"/>
+            <classpath>
+                <pathelement location="${android.sdk}/android.jar"/>
+                <pathelement location="${flex.sdk}/lib/android/FlashRuntimeExtensions.jar"/>
+                <!-- <pathelement location="../android-jar/libs/android-support-v4.jar"/> -->
+            </classpath>
+        </javac>
+        
+		<delete file="android/${name.jar}.jar"/>
+        <jar basedir="../temp-java" destfile="android/${name.jar}.jar"/>
+		<!-- <copy file="../android-jar/libs/android-support-v4.jar" todir="../temp/android/"/> -->
+		
+		<delete dir="../temp-java"/>
+    </target>
+
+    <!-- Actionscript -->
+    <target name="swc" description="Build SWC library">
+		<delete dir="../temp-swc/"/>
+        <mkdir dir="../temp-swc"/>
+
+        <fileset dir="../android-swc/src" casesensitive="yes" id="classfiles">
+            <include name="**/*.as"/>
+        </fileset>
+
+        <pathconvert property="classlist" refid="classfiles" pathsep=" " dirsep=".">
+            <regexpmapper from=".*src.(.*)\.as" to="\1"/>
+        </pathconvert>
+
+        <exec executable="${flex.sdk}/bin/compc${flex.sdk.ext}" failonerror="true">
+            <env key="AIR_SDK_HOME" value="${flex.sdk}"/>
+            <arg line='-source-path ../android-swc/src'/>
+            <arg line='-output ../temp-swc/${name}.swc'/>
+            <arg line='-swf-version=28'/>
+            <arg line='-external-library-path+="${flex.sdk}/frameworks/libs/air/airglobal.swc"'/>
+            <arg line='-include-classes ${classlist}'/>
+        </exec>
+
+        <unzip src="../temp-swc/${name}.swc" dest="../temp-swc" overwrite="true"/>
+        <copy file="../temp-swc/library.swf" todir="android" overwrite="true"/>
+        <copy file="../temp-swc/library.swf" todir="default" overwrite="true"/>
+       
+    </target>
+
+    <!-- Package -->
+    <target name="package" description="Create the extension package">
+        
+		<delete file="${name}.ane"/>
+		
+		<exec executable="${flex.sdk}/bin/adt${flex.sdk.ext}" failonerror="true">
+            <arg value="-package"/>
+            <arg value="-target"/>
+            <arg value="ane"/>
+            <arg value="./${name}.ane"/>
+            <arg value="extension.xml"/>
+            <arg line="-swc ../temp-swc/${name}.swc"/>
+            <arg line="-platform Android-ARM -C android/ ."/>
+            <arg line="-platform Android-x86 -C android/ ."/>
+            <arg line="-platform default -C default/ ."/>
+        </exec>
+
+        <delete dir="../temp-swc/"/>
+    </target>
+    
+</project>
\ No newline at end of file