diff --git a/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java b/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java
index a044e59..3f58628 100644
--- a/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java
+++ b/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java
@@ -23,8 +23,6 @@
 
 package com.wunderlist.slidinglayer;
 
-import java.util.Random;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -49,6 +47,8 @@
 import android.widget.RelativeLayout;
 import android.widget.Scroller;
 
+import java.util.Random;
+
 
 public class SlidingLayer extends FrameLayout {
 
@@ -1163,16 +1163,26 @@ public void setChangeStateOnTap(boolean changeStateOnTap) {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
-        int width = getDefaultSize(0, widthMeasureSpec);
-        int height = getDefaultSize(0, heightMeasureSpec);
-        setMeasuredDimension(width, height);
+        int count = getChildCount();
+
+        int maxHeight = 0;
+        int maxWidth = 0;
+
+        for (int i = 0; i < count; i++) {
+            final View child = getChildAt(i);
+            if (child.getVisibility() != GONE) {
+                measureChild(child, widthMeasureSpec, heightMeasureSpec);
+
+                maxHeight = Math.max(maxHeight, child.getMeasuredHeight());
+                maxWidth = Math.max(maxWidth, child.getMeasuredWidth());
+            }
+        }
+
+        setMeasuredDimension(maxWidth, maxHeight);
 
         if (mLayerTransformer != null) {
             mLayerTransformer.onMeasure(this, mScreenSide);
         }
-
-        super.onMeasure(getChildMeasureSpec(widthMeasureSpec, 0, width),
-                getChildMeasureSpec(heightMeasureSpec, 0, height));
     }
 
     @Override
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 828e75c..28b2dfc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 12 11:01:33 CEST 2015
+#Tue May 24 18:20:09 EEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip