diff --git a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java
index bea21a3..933b751 100644
--- a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java
+++ b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java
@@ -11,8 +11,8 @@
 @SuppressWarnings("unused")
 public class AvatarImageBehavior extends CoordinatorLayout.Behavior<CircleImageView> {
 
-    private final static float MIN_AVATAR_PERCENTAGE_SIZE   = 0.3f;
-    private final static int EXTRA_FINAL_AVATAR_PADDING     = 80;
+    private final static float MIN_AVATAR_PERCENTAGE_SIZE = 0.3f;
+    private final static int EXTRA_FINAL_AVATAR_PADDING = 80;
 
     private final static String TAG = "behavior";
     private final Context mContext;
@@ -22,13 +22,18 @@ public class AvatarImageBehavior extends CoordinatorLayout.Behavior<CircleImageV
     private float mStartPosition;
     private int mStartXPosition;
     private float mStartToolbarPosition;
+    private int mStartYPosition;
+    private int mFinalYPosition;
+    private int finalHeight;
+    private int mStartHeight;
+    private int mFinalXPosition;
 
     public AvatarImageBehavior(Context context, AttributeSet attrs) {
         mContext = context;
         init();
 
         mFinalLeftAvatarPadding = context.getResources().getDimension(
-            R.dimen.spacing_normal);
+                R.dimen.spacing_normal);
     }
 
     private void init() {
@@ -39,12 +44,6 @@ private void bindDimensions() {
         mAvatarMaxSize = mContext.getResources().getDimension(R.dimen.image_width);
     }
 
-    private int mStartYPosition;
-
-    private int mFinalYPosition;
-    private int finalHeight;
-    private int mStartHeight;
-    private int mFinalXPosition;
     @Override
     public boolean layoutDependsOn(CoordinatorLayout parent, CircleImageView child, View dependency) {
         return dependency instanceof Toolbar;
@@ -58,10 +57,10 @@ public boolean onDependentViewChanged(CoordinatorLayout parent, CircleImageView
         float expandedPercentageFactor = dependency.getY() / maxScrollDistance;
 
         float distanceYToSubtract = ((mStartYPosition - mFinalYPosition)
-            * (1f - expandedPercentageFactor)) + (child.getHeight()/2);
+                * (1f - expandedPercentageFactor)) + (child.getHeight() / 2);
 
         float distanceXToSubtract = ((mStartXPosition - mFinalXPosition)
-            * (1f - expandedPercentageFactor)) + (child.getWidth()/2);
+                * (1f - expandedPercentageFactor)) + (child.getWidth() / 2);
 
         float heightToSubtract = ((mStartHeight - finalHeight) * (1f - expandedPercentageFactor));
 
@@ -79,10 +78,11 @@ public boolean onDependentViewChanged(CoordinatorLayout parent, CircleImageView
 
     private void shouldInitProperties(CircleImageView child, View dependency) {
         if (mStartYPosition == 0)
-            mStartYPosition = (int) (child.getY() + (child.getHeight() / 2));
+            //mStartYPosition = (int) (child.getY() + (child.getHeight() / 2));
+            mStartYPosition = (int) child.getY();
 
         if (mFinalYPosition == 0)
-            mFinalYPosition = (dependency.getHeight() /2);
+            mFinalYPosition = (dependency.getHeight() / 2);
 
         if (mStartHeight == 0)
             mStartHeight = child.getHeight();
@@ -97,7 +97,7 @@ private void shouldInitProperties(CircleImageView child, View dependency) {
             mFinalXPosition = mContext.getResources().getDimensionPixelOffset(R.dimen.abc_action_bar_content_inset_material) + (finalHeight / 2);
 
         if (mStartToolbarPosition == 0)
-            mStartToolbarPosition = dependency.getY() + (dependency.getHeight()/2);
+            mStartToolbarPosition = dependency.getY() + (dependency.getHeight() / 2);
     }
 
     public int getStatusBarHeight() {
diff --git a/build.gradle b/build.gradle
index d743c29..0777e85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
 
     }
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..1b01be7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,19 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+#Fri Sep 16 10:05:41 EEST 2016
+systemProp.https.proxyPort=3128
+systemProp.http.proxyHost=10.0.0.78
+systemProp.https.proxyHost=10.0.0.78
+systemProp.http.proxyPort=3128