diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9e4584f..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-RoundOverlayProgress
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9a8b7e5..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d945063..288c400 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$/sample" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a1e020..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" 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/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ed1ae2c..5308068 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 
@@ -13,3 +13,16 @@ allprojects {
         jcenter()
     }
 }
+
+ext {
+    // SDK and Tools Versions
+    compileSdkVersion = 22
+    targetSdkVersion = 22
+    buildToolsVersion = "25.0.0"
+    minSdkVersion = 14
+    versionCode = 11
+    versionName = "1.1.0"
+
+    // App dependencies
+    supportLibraryVersion = '22.1.1'
+}
diff --git a/build/generated/mockable-android-22.jar b/build/generated/mockable-android-22.jar
new file mode 100644
index 0000000..e28bb3f
Binary files /dev/null and b/build/generated/mockable-android-22.jar differ
diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar
new file mode 100644
index 0000000..81e1f9d
Binary files /dev/null and b/build/generated/mockable-android-25.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..b90c1fb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Jan 09 11:52:36 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 5434294..29821d0 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
-apply plugin: 'android-maven'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 22
-        versionCode 9
-        versionName "1.0.9"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
     }
     buildTypes {
         release {
@@ -21,5 +21,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 0bbb82b..5d8c295 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,8 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pl.schibsted.roundoverlayprogress">
+<manifest package="pl.schibsted.roundoverlayprogress">
 
-    <application android:allowBackup="true" android:label="@string/app_name">
-
-    </application>
 
 </manifest>
diff --git a/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java b/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java
index 6260cfc..a0124e1 100644
--- a/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java
+++ b/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java
@@ -68,10 +68,10 @@ private void init(AttributeSet attrs) {
         int src = attrs.getAttributeResourceValue("http://schemas.android.com/apk/res/android", "src", 0);
         BitmapDrawable bitmapDrawable = (BitmapDrawable) getResources().getDrawable(src);
 
-        progressColor = a.getColor(R.styleable.RoundOverlayProgressView_progressColor, getResources().getColor(R.color.default_progress));
-        maxProgress = a.getInteger(R.styleable.RoundOverlayProgressView_maxProgress, 100);
-        animationDuration = a.getInteger(R.styleable.RoundOverlayProgressView_animationDuration, 300);
-        animate = a.getBoolean(R.styleable.RoundOverlayProgressView_animate, true);
+        progressColor = a.getColor(R.styleable.RoundOverlayProgressView_ropv_progressColor, getResources().getColor(R.color.default_progress));
+        maxProgress = a.getInteger(R.styleable.RoundOverlayProgressView_ropv_maxProgress, 100);
+        animationDuration = a.getInteger(R.styleable.RoundOverlayProgressView_ropv_animationDuration, 300);
+        animate = a.getBoolean(R.styleable.RoundOverlayProgressView_ropv_animate, true);
 
         a.recycle();
 
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index fad2b03..65b1e41 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="RoundOverlayProgressView">
-        <attr name="progressColor" format="color" />
-        <attr name="maxProgress" format="integer" />
-        <attr name="animationDuration" format="integer" />
-        <attr name="animate" format="boolean" />
+        <attr name="ropv_progressColor" format="color" />
+        <attr name="ropv_maxProgress" format="integer" />
+        <attr name="ropv_animationDuration" format="integer" />
+        <attr name="ropv_animate" format="boolean" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 1ffd634..69c79f5 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -16,8 +16,8 @@
         android:layout_width="150dp"
         android:layout_height="150dp"
         android:src="@drawable/sample_image"
-        app:maxProgress="100"
-        app:progressColor="#80FFFFFF" />
+        app:ropv_maxProgress="100"
+        app:ropv_progressColor="#80FFFFFF" />
 
     <Button
         android:id="@+id/random_button"