diff --git a/android/build.gradle b/android/build.gradle
index a07b6bd43e..fbb28d8297 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,5 +21,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'io.sentry:sentry-android:1.0.0'
+    compile 'io.sentry:sentry-android:1.2.1'
 }
diff --git a/android/src/main/java/io/sentry/RNSentryModule.java b/android/src/main/java/io/sentry/RNSentryModule.java
index 1d67eb2106..abea5efe64 100644
--- a/android/src/main/java/io/sentry/RNSentryModule.java
+++ b/android/src/main/java/io/sentry/RNSentryModule.java
@@ -98,7 +98,7 @@ public void onSuccess(Event event) {
                 RNSentryEventEmitter.sendEvent(reactContext, RNSentryEventEmitter.SENTRY_EVENT_SENT_SUCCESSFULLY, params);
             }
         });
-        sentryClient.addShouldSendEvent(new ShouldSendEventCallback() {
+        sentryClient.addShouldSendEventCallback(new ShouldSendEventCallback() {
             @Override
             public boolean shouldSend(Event event) {
                 // We don't want to send events that are from ExceptionsManagerModule.
diff --git a/docs/config.rst b/docs/config.rst
index d4bab2debc..bcda6e64f1 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -1,5 +1,5 @@
 Additional Configuration
-========================
+------------------------
 
 These are functions you can call in your javascript code:
 
diff --git a/docs/index.rst b/docs/index.rst
index f1fcf8b2a7..0d470067b1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -88,6 +88,13 @@ Note: When you run ``react-native link`` we will automatically update your
 You can pass additional configuration options to the `config()` method if
 you want to do so.
 
+Mixed Stacktraces
+-----------------
+
+Currently we only support mixed stacktraces on iOS. By default this feature is
+enabled. If you encounter performance issues we recommend try turning it
+off ``deactivateStacktraceMerging: true`` see: :doc:`config`.
+
 Deep Dive
 ---------
 
diff --git a/package.json b/package.json
index 5faa6ddf00..67e9e97e83 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "glob": "7.1.1",
     "inquirer": "3.0.6",
     "raven-js": "^3.16.0",
-    "sentry-cli-binary": "^1.13.3",
+    "sentry-cli-binary": "^1.16.0",
     "xcode": "0.9.3"
   },
   "rnpm": {