diff --git a/android/build.gradle b/android/build.gradle
index c72606f8178c54e37a61f8c6cf852130cb9db945..b0cd727cceebb1a662741445a625050bda27b06b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
diff --git a/android/src/main/java/com/reactlibrary/ReactContextBuilder.java b/android/src/main/java/com/reactlibrary/ReactContextBuilder.java
index e2ebdfead3fcb63bef2a40809e533df13f20b99b..37a7b3549121fa2a716fe57b85d2bd5acc15c742 100644
--- a/android/src/main/java/com/reactlibrary/ReactContextBuilder.java
+++ b/android/src/main/java/com/reactlibrary/ReactContextBuilder.java
@@ -1,6 +1,7 @@
 package com.reactlibrary;
 
 import android.content.Context;
+import android.net.Uri;
 
 import com.facebook.react.NativeModuleRegistryBuilder;
 import com.facebook.react.ReactPackage;
@@ -20,6 +21,8 @@ import com.facebook.soloader.SoLoader;
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
 
+import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName;
+
 public class ReactContextBuilder {
 
     private Context parentContext;
@@ -54,7 +57,10 @@ public class ReactContextBuilder {
     }
 
     public ReactApplicationContext build() throws Exception {
-        JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutorFactory().create();
+        String appName = Uri.encode(parentContext.getPackageName());
+        String deviceName = Uri.encode(getFriendlyDeviceName());
+        JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutorFactory(appName, deviceName)
+                .create();
 
         // fresh new react context
         final ReactApplicationContext reactContext = new ReactApplicationContext(parentContext);
diff --git a/package.json b/package.json
index 4f3830eb7d57af9ca11a67e6169eef20f22b764d..9b005cb62416d5541670f4a511896540131fd254 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,6 @@
     "index.js"
   ],
   "peerDependencies": {
-    "react-native": "~0.49.0"
+    "react-native": ">=0.50.0"
   }
 }