diff --git a/build.gradle b/build.gradle
index c0b83ec..8d0deab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..615f4fe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon May 16 15:26:11 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index a74a955..4ba2646 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 23
-  buildToolsVersion "23.0.1"
+  buildToolsVersion "23.0.3"
 
   defaultConfig {
     applicationId "com.sromku.simple.fb.example"
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 7e8d9f3..26cbb5c 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -2,10 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sromku.simple.fb.example">
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="22" />
-
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
@@ -26,8 +22,12 @@
 
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/app_id" />
+            android:value="@string/facebook_app_id" />
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationName"
+            android:value="@string/app_name" />
 
+        <!--TODO change the provider id to your own id-->
         <provider
             android:name="com.facebook.FacebookContentProvider"
             android:authorities="com.facebook.app.FacebookContentProvider728615400528729"
@@ -37,6 +37,16 @@
                   android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
                   android:theme="@android:style/Theme.Translucent.NoTitleBar"
                   android:label="@string/app_name" />
+        <activity
+            android:name="com.facebook.CustomTabActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="@string/fb_login_protocol_scheme" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
diff --git a/sample/src/main/java/com/sromku/simple/fb/example/SampleApplication.java b/sample/src/main/java/com/sromku/simple/fb/example/SampleApplication.java
index a24bb25..1e783e4 100644
--- a/sample/src/main/java/com/sromku/simple/fb/example/SampleApplication.java
+++ b/sample/src/main/java/com/sromku/simple/fb/example/SampleApplication.java
@@ -10,7 +10,7 @@
 import com.sromku.simple.fb.utils.Logger;
 
 public class SampleApplication extends Application {
-    private static final String APP_ID = "728615400528729";
+    private static final String FACEBOOK_APP_ID = "728615400528729";
     private static final String APP_NAMESPACE = "sromkuapp_vtwo";
 
     @Override
@@ -35,7 +35,7 @@ public void onCreate() {
                 Permission.PUBLISH_ACTION };
 
         SimpleFacebookConfiguration configuration = new SimpleFacebookConfiguration.Builder()
-                .setAppId(APP_ID)
+                .setAppId(FACEBOOK_APP_ID)
                 .setNamespace(APP_NAMESPACE)
                 .setPermissions(permissions)
                 .setDefaultAudience(DefaultAudience.FRIENDS)
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 8430787..37f84aa 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simple Facebook Sample</string>
-    <string name="app_id">728615400528729</string>
+    <string name="facebook_app_id">728615400528729</string>
+    <string name="fb_login_protocol_scheme">fb728615400528729</string> <!--same as facebook_app_id, but with the "fb" prefix-->
     <string name="logout">Logout</string>
     <string name="login">Login</string>
     <string name="get_friends">Get friends</string>
diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle
index 5095f33..0d7eeac 100644
--- a/simple-fb/build.gradle
+++ b/simple-fb/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 15
@@ -52,9 +52,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -65,8 +65,8 @@ allprojects {
 }
 
 dependencies {
-    compile 'com.facebook.android:facebook-android-sdk:4.7.+'
+    compile 'com.facebook.android:facebook-android-sdk:[4,5)'
     // compile project(':facebook')
-    compile 'com.google.code.gson:gson:1.7.2'
+    compile 'com.google.code.gson:gson:2.4'
 }
 
diff --git a/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebook.java b/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebook.java
index 3bf7bf8..83909a3 100644
--- a/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebook.java
+++ b/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebook.java
@@ -1491,18 +1491,18 @@ public void publish(Feed feed, OnPublishListener onPublishListener) {
      * <br>
      *
      * For having the native dialog, you must add to your <b>manifest.xml</b>
-     * 'app_id' meta value:
+     * 'facebook_app_id' meta value:
      *
      * <pre>
      * {@code <}meta-data
      *      android:name="com.facebook.sdk.ApplicationId"
-     *      android:value="@string/app_id" /{@code >}
+     *      android:value="@string/facebook_app_id" /{@code >}
      * </pre>
      *
-     * And in your <b>string.xml</b> add your app_id. For example:
+     * And in your <b>string.xml</b> add your facebook_app_id. For example:
      *
      * <pre>
-     * {@code <}string name="app_id"{@code >}625994234086470{@code <}/string{@code >}
+     * {@code <}string name="facebook_app_id"{@code >}625994234086470{@code <}/string{@code >}
      * </pre>
      *
      * @param feed