diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2903758..cb594e3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,13 +13,7 @@
             <option value="$PROJECT_DIR$/carousel" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/carousel" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f9808f7..75318f7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 0841242..8cb8b96 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,5 +38,4 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.github.bumptech.glide:glide:3.5.2'
     compile project(':carousel')
-    compile 'com.google.android.gms:play-services:9.2.+'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index de2b134..e2082dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,24 +1,8 @@
 <manifest package="com.carouselview"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="true"/>
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-    <uses-permission android:name="com.carouselview.permission.MAPS_RECEIVE"/>
-    <uses-permission android:name="com.carouselview.permission.READ_GSERVICES"/>
-    <permission
-        android:name="com.carouselview.permission.MAPS_RECEIVE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"
@@ -37,11 +21,6 @@
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyC_Pp-vwac64qilw-Q7OYxCtptL1dQSZBg"/>
-
-        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
     </application>
 
 
diff --git a/build.gradle b/build.gradle
index e0b366a..74b2ab0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/carousel/src/main/java/com/carousel/Rotator.java b/carousel/src/main/java/com/carousel/Rotator.java
index 8482399..178c63a 100644
--- a/carousel/src/main/java/com/carousel/Rotator.java
+++ b/carousel/src/main/java/com/carousel/Rotator.java
@@ -117,7 +117,7 @@ boolean computeAngleOffset() {
             case SCROLL_MODE:
 
                 float sc = (float) timePassed / mDurationMillis;
-                mCurrAngleDeg = mStartAngleDeg + Math.round(mDeltaAngleDeg * sc);
+                mCurrAngleDeg = mStartAngleDeg + (mDeltaAngleDeg * sc);
                 break;
 
             case FLING_MODE:
@@ -125,7 +125,7 @@ boolean computeAngleOffset() {
                 float timePassedSeconds = timePassed / 1000.0f;
                 float distance = mCoeffVelocity * mVelocity * timePassedSeconds
                         - (DECELERATION * timePassedSeconds * timePassedSeconds / 2.0f);
-                mCurrAngleDeg = mStartAngleDeg + Math.round(distance);
+                mCurrAngleDeg = mStartAngleDeg + distance;
                 break;
             }
             return true; // return true because animation still running
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23df6e..9b49049 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Tue Dec 13 09:10:18 GMT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip