diff --git a/.DS_Store b/.DS_Store
index 973c972..de78195 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.classpath b/.classpath
index 79a4dc8..3961049 100644
--- a/.classpath
+++ b/.classpath
@@ -3,15 +3,15 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="build/.apt_generated"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/Users/marcelpociot/Library/android-sdk-macosx/add-ons/addon-google_apis-google-10/libs/maps.jar"/>
-	<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/titanium.jar"/>
-	<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/kroll-common.jar"/>
-	<classpathentry kind="lib" path="/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android/kroll-apt.jar"/>
+	<classpathentry kind="lib" path="/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-23/libs/maps.jar"/>
+	<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/titanium.jar"/>
+	<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/kroll-common.jar"/>
+	<classpathentry kind="lib" path="/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android/kroll-apt.jar"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/Users/marcelpociot/Library/android-sdk-macosx/platforms/android-16/android.jar"/>
+	<classpathentry kind="lib" path="/Users/ant/Library/Android/sdk/platforms/android-23/android.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index f97964b..d768165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 tmp
 bin
 build
-*.zip
 .apt_generated
diff --git a/build.properties b/build.properties
index ca28ca9..a3e671b 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,7 @@
-titanium.platform=/Users/marcelpociot/Library/Application Support/Titanium/mobilesdk/osx/3.2.3.GA/android
-android.platform=/Users/marcelpociot/Library/android-sdk-macosx/platforms/android-16
-google.apis=/Users/marcelpociot/Library/android-sdk-macosx/add-ons/addon-google_apis-google-16
-android.ndk=/Users/marcelpociot/Downloads/android-ndk-r9d
\ No newline at end of file
+titanium.platform=/Users/ant/Library/Application Support/Titanium/mobilesdk/osx/6.0.1.GA/android
+# android.platform=/Users/ant/Library/Android/sdk/platforms/android-19
+android.platform=/Users/ant/Library/Android/sdk/platforms/android-23
+# google.apis=/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-16
+google.apis=/Users/ant/Library/Android/sdk/add-ons/addon-google_apis-google-23
+# android.ndk=/Users/ant/Developer/tools/android-ndk-r9d
+android.ndk=/Users/ant/Developer/tools/android-ndk-r11c
\ No newline at end of file
diff --git a/dist/de.marcelpociot.webviewfragment-android-2.0.zip b/dist/de.marcelpociot.webviewfragment-android-2.0.zip
new file mode 100644
index 0000000..01d06b9
Binary files /dev/null and b/dist/de.marcelpociot.webviewfragment-android-2.0.zip differ
diff --git a/dist/webviewfragment.jar b/dist/webviewfragment.jar
index be83e0d..b354e2a 100644
Binary files a/dist/webviewfragment.jar and b/dist/webviewfragment.jar differ
diff --git a/libs/armeabi-v7a/libde.marcelpociot.webviewfragment.so b/libs/armeabi-v7a/libde.marcelpociot.webviewfragment.so
index 4a3367a..f5a94fb 100644
Binary files a/libs/armeabi-v7a/libde.marcelpociot.webviewfragment.so and b/libs/armeabi-v7a/libde.marcelpociot.webviewfragment.so differ
diff --git a/libs/armeabi/libde.marcelpociot.webviewfragment.so b/libs/armeabi/libde.marcelpociot.webviewfragment.so
deleted file mode 100644
index 64084b7..0000000
Binary files a/libs/armeabi/libde.marcelpociot.webviewfragment.so and /dev/null differ
diff --git a/libs/x86/libde.marcelpociot.webviewfragment.so b/libs/x86/libde.marcelpociot.webviewfragment.so
index 577cd36..e504b5e 100644
Binary files a/libs/x86/libde.marcelpociot.webviewfragment.so and b/libs/x86/libde.marcelpociot.webviewfragment.so differ
diff --git a/manifest b/manifest
index 38b4eed..4b24178 100644
--- a/manifest
+++ b/manifest
@@ -2,8 +2,9 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.0
-apiversion: 2
+version: 2.0
+apiversion: 3
+architectures: armeabi-v7a x86
 description: My module
 author: Marcel Pociot
 license: MIT
@@ -15,4 +16,4 @@ name: webviewfragment
 moduleid: de.marcelpociot.webviewfragment
 guid: ce49d91a-9a85-4608-bb37-0dd75a6d4dff
 platform: android
-minsdk: 3.2.3.GA
+minsdk: 6.0.0
diff --git a/src/de/marcelpociot/webviewfragment/Webview.java b/src/de/marcelpociot/webviewfragment/Webview.java
index 65a9e19..ca3a865 100644
--- a/src/de/marcelpociot/webviewfragment/Webview.java
+++ b/src/de/marcelpociot/webviewfragment/Webview.java
@@ -2,7 +2,7 @@
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.titanium.proxy.TiViewProxy;
-import org.appcelerator.titanium.util.Log;
+import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.util.TiRHelper;
 import org.appcelerator.titanium.util.TiRHelper.ResourceNotFoundException;
 import org.appcelerator.titanium.view.TiUIView;
diff --git a/src/de/marcelpociot/webviewfragment/WebviewProxy.java b/src/de/marcelpociot/webviewfragment/WebviewProxy.java
index 2ae4aeb..66a6a77 100644
--- a/src/de/marcelpociot/webviewfragment/WebviewProxy.java
+++ b/src/de/marcelpociot/webviewfragment/WebviewProxy.java
@@ -4,7 +4,7 @@
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
-import org.appcelerator.titanium.util.Log;
+import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiRHelper;
 import org.appcelerator.titanium.util.TiRHelper.ResourceNotFoundException;