diff --git a/library/build.gradle b/library/build.gradle
index 47e81e1..097c374 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         // applicationId "com.oguzdev.circularfloatingactionmenu.library"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 24
         versionCode 3
         versionName "1.0.2"
     }
@@ -26,6 +26,8 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:design:23.4.0'
 }
 
 // apply from: '../gradle-mvn-push.gradle'
diff --git a/library/src/main/java/com/oguzdev/circularfloatingactionmenu/library/FloatingActionMenu.java b/library/src/main/java/com/oguzdev/circularfloatingactionmenu/library/FloatingActionMenu.java
index c0764fc..87a29e4 100644
--- a/library/src/main/java/com/oguzdev/circularfloatingactionmenu/library/FloatingActionMenu.java
+++ b/library/src/main/java/com/oguzdev/circularfloatingactionmenu/library/FloatingActionMenu.java
@@ -12,6 +12,7 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.hardware.SensorManager;
+import android.support.v7.widget.TintContextWrapper;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -392,9 +393,12 @@ public List<Item> getSubActionItems() {
      */
     public View getActivityContentView() {
         try {
-            return ((Activity) mainActionView.getContext()).getWindow().getDecorView().findViewById(android.R.id.content);
-        }
-        catch(ClassCastException e) {
+            if (mainActionView.getContext() instanceof TintContextWrapper) {
+                return ((Activity) ((TintContextWrapper) mainActionView.getContext()).getBaseContext()).getWindow().getDecorView().findViewById(android.R.id.content);
+            } else {
+                return ((Activity) mainActionView.getContext()).getWindow().getDecorView().findViewById(android.R.id.content);
+            }
+        } catch (ClassCastException e) {
             throw new ClassCastException("Please provide an Activity context for this FloatingActionMenu.");
         }
     }
diff --git a/samples/build.gradle b/samples/build.gradle
index 82f8e94..a883d1b 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         applicationId "com.oguzdev.circularfloatingactionmenu.samples"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 24
         versionCode 3
         versionName "1.0.2"
     }