diff --git a/.idea/libraries/animated_vector_drawable_25_1_1.xml b/.idea/libraries/animated_vector_drawable_25_1_1.xml
index d2fa75f..bdccb6f 100644
--- a/.idea/libraries/animated_vector_drawable_25_1_1.xml
+++ b/.idea/libraries/animated_vector_drawable_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="animated-vector-drawable-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/c3e0276fc821cba6750719cd80ad3f6dd6d487cb/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/c3e0276fc821cba6750719cd80ad3f6dd6d487cb/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/f2f09a34f3750c814424314e949eef6c35c91286/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/f2f09a34f3750c814424314e949eef6c35c91286/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/appcompat_v7_25_1_1.xml b/.idea/libraries/appcompat_v7_25_1_1.xml
index 418ea36..a1c526e 100644
--- a/.idea/libraries/appcompat_v7_25_1_1.xml
+++ b/.idea/libraries/appcompat_v7_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="appcompat-v7-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/d802a86c13a9bd0601ca9e10f6b383c5ff525988/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/d802a86c13a9bd0601ca9e10f6b383c5ff525988/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/1e36fb51a54e62a89c6610a46c2a613ae26cb2e6/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/1e36fb51a54e62a89c6610a46c2a613ae26cb2e6/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml
index 1a1c740..476e2f0 100644
--- a/.idea/libraries/espresso_core_2_2_2.xml
+++ b/.idea/libraries/espresso_core_2_2_2.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="espresso-core-2.2.2">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/9d0c5713953a92c3d70ba6f967e676a12f3592b2/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/9d0c5713953a92c3d70ba6f967e676a12f3592b2/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/68d933e8aa3c568571413dcb3e6a258eaea7a818/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/68d933e8aa3c568571413dcb3e6a258eaea7a818/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml
index 5222a92..646527a 100644
--- a/.idea/libraries/espresso_idling_resource_2_2_2.xml
+++ b/.idea/libraries/espresso_idling_resource_2_2_2.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="espresso-idling-resource-2.2.2">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/0226ef0c65ef8d785ae41729b50e85b009649a97/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/0226ef0c65ef8d785ae41729b50e85b009649a97/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/8e30687de062b1bc9bbb49bb6a375cabe3896a0b/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/8e30687de062b1bc9bbb49bb6a375cabe3896a0b/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
index 5152e66..2565f08 100644
--- a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
+++ b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="exposed-instrumentation-api-publish-0.5">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/5c437eae2f010230ed18d5de58d0c0d55f3a2d11/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/5c437eae2f010230ed18d5de58d0c0d55f3a2d11/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/b70952651d4025be32724c925335ab502a7f4f57/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/b70952651d4025be32724c925335ab502a7f4f57/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml
index 597212e..91c140d 100644
--- a/.idea/libraries/rules_0_5.xml
+++ b/.idea/libraries/rules_0_5.xml
@@ -5,8 +5,8 @@
       <root url="jar://$USER_HOME$/.android/build-cache/1852b8bf498a849e7769d52768012ea63abd7380/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/c2c363f0990a1eb1a26917403f94bb85d7548e3c/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/c2c363f0990a1eb1a26917403f94bb85d7548e3c/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/3a8005945649830f4917c268fdbcba906692c8fa/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/3a8005945649830f4917c268fdbcba906692c8fa/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml
index 1b33ac7..96316de 100644
--- a/.idea/libraries/runner_0_5.xml
+++ b/.idea/libraries/runner_0_5.xml
@@ -5,8 +5,8 @@
       <root url="jar://$USER_HOME$/.android/build-cache/32060387bc6e3dbc244946b8433af876c334a83a/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/58b4db1298a4e098fe88d0f9a087616c1880bab2/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/58b4db1298a4e098fe88d0f9a087616c1880bab2/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/7c295634e51b520f8135c683edc5e40ae6036a0e/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/7c295634e51b520f8135c683edc5e40ae6036a0e/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_compat_25_1_1.xml b/.idea/libraries/support_compat_25_1_1.xml
index 2d993b9..1045396 100644
--- a/.idea/libraries/support_compat_25_1_1.xml
+++ b/.idea/libraries/support_compat_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-compat-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/e4cfc0ad77d32cd836c4fbbec82c2bc516409af6/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/e4cfc0ad77d32cd836c4fbbec82c2bc516409af6/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/96b254b53c199777d39f74513d8fb61007b330ee/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/96b254b53c199777d39f74513d8fb61007b330ee/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_core_ui_25_1_1.xml b/.idea/libraries/support_core_ui_25_1_1.xml
index d9eb80d..8da7045 100644
--- a/.idea/libraries/support_core_ui_25_1_1.xml
+++ b/.idea/libraries/support_core_ui_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-core-ui-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/8407dcbd9a02ab0e78b47cd74e47e82d5ed29971/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/8407dcbd9a02ab0e78b47cd74e47e82d5ed29971/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/77f7f658600b66159764616320989e57d3ed02e0/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/77f7f658600b66159764616320989e57d3ed02e0/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_core_utils_25_1_1.xml b/.idea/libraries/support_core_utils_25_1_1.xml
index 5f45667..e2d1b01 100644
--- a/.idea/libraries/support_core_utils_25_1_1.xml
+++ b/.idea/libraries/support_core_utils_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-core-utils-25.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/057fed6f2a3959ebd2bcc41033af1b7823b6158e/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/057fed6f2a3959ebd2bcc41033af1b7823b6158e/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/fceee4a535e58796fa3f084e167d94c818a5d8bb/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/fceee4a535e58796fa3f084e167d94c818a5d8bb/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_fragment_25_1_1.xml b/.idea/libraries/support_fragment_25_1_1.xml
index 36cf780..0a07a5a 100644
--- a/.idea/libraries/support_fragment_25_1_1.xml
+++ b/.idea/libraries/support_fragment_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-fragment-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/9a52f573f7356b8b6565384ba2f2b23628ff7352/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/9a52f573f7356b8b6565384ba2f2b23628ff7352/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/2ae714c07a502659d8f80d0caaa550196c2cb532/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2ae714c07a502659d8f80d0caaa550196c2cb532/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_media_compat_25_1_1.xml b/.idea/libraries/support_media_compat_25_1_1.xml
index 43b001c..4526a84 100644
--- a/.idea/libraries/support_media_compat_25_1_1.xml
+++ b/.idea/libraries/support_media_compat_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-media-compat-25.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/559f4fc74c3c8f4f57d920d2134cf6bb0788a722/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/559f4fc74c3c8f4f57d920d2134cf6bb0788a722/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e98fc0e1035a34433148aede1df4cef9133d16bf/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/e98fc0e1035a34433148aede1df4cef9133d16bf/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/support_v4_25_1_1.xml b/.idea/libraries/support_v4_25_1_1.xml
index 1d42a0a..612912d 100644
--- a/.idea/libraries/support_v4_25_1_1.xml
+++ b/.idea/libraries/support_v4_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-v4-25.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/c305d0f8af24f645b6fef517a7cf28ff4a63d8c5/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/c305d0f8af24f645b6fef517a7cf28ff4a63d8c5/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/1fea753a7d1fc608c8b6b7e5b03c577c512a6d97/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/1fea753a7d1fc608c8b6b7e5b03c577c512a6d97/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/support_vector_drawable_25_1_1.xml b/.idea/libraries/support_vector_drawable_25_1_1.xml
index 57b1ae5..c183294 100644
--- a/.idea/libraries/support_vector_drawable_25_1_1.xml
+++ b/.idea/libraries/support_vector_drawable_25_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-vector-drawable-25.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/176434d7072c8ad74e4a5ac9ba25747d4950d4db/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/176434d7072c8ad74e4a5ac9ba25747d4950d4db/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/76157f67b31eb6e4064230d64e94f25509781e59/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/76157f67b31eb6e4064230d64e94f25509781e59/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/build.gradle b/build.gradle
index 166d919..dbb3ca8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta4'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
diff --git a/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java b/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java
index 39e8690..2e1205c 100644
--- a/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java
+++ b/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java
@@ -86,7 +86,7 @@ public enum AnimationType {
 
     private RectF mButtonRectF,mArcRectF;
 
-    private ValueAnimator mLoadingAnimator;
+    private AnimatorSet mLoadingAnimatorSet;
 
     public LoadingButton(Context context) {
         super(context);
@@ -254,8 +254,8 @@ public void startLoading(){
      * loading data successful
      */
     public void loadingSuccessful(){
-        if(mLoadingAnimator != null && mLoadingAnimator.isRunning()){
-            mLoadingAnimator.end();
+        if(mLoadingAnimatorSet != null && mLoadingAnimatorSet.isStarted()){
+            mLoadingAnimatorSet.end();
             mCurrentState = STATE_STOP_LOADING;
             playSuccessAnimation();
         }
@@ -265,8 +265,8 @@ public void loadingSuccessful(){
      * loading data failed
      */
     public void loadingFailed(){
-        if(mLoadingAnimator != null && mLoadingAnimator.isRunning()){
-            mLoadingAnimator.end();
+        if(mLoadingAnimatorSet != null && mLoadingAnimatorSet.isStarted()){
+            mLoadingAnimatorSet.end();
             mCurrentState = STATE_STOP_LOADING;
             playFailedAnimation();
         }
@@ -495,26 +495,26 @@ public void onAnimationEnd(Animator animator) {
             }
         });
 
-        mLoadingAnimator = ValueAnimator.ofInt(30,300);
-        mLoadingAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+        ValueAnimator loadingAnimator = ValueAnimator.ofInt(30,300);
+        loadingAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
             @Override
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 mAngle = (Integer) valueAnimator.getAnimatedValue();
                 invalidate();
             }
         });
-        mLoadingAnimator.setDuration(1000);
-        mLoadingAnimator.setRepeatCount(-1);
-        mLoadingAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        mLoadingAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
+        loadingAnimator.setDuration(1000);
+        loadingAnimator.setRepeatCount(-1);
+        loadingAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        loadingAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
 
-        AnimatorSet set = new AnimatorSet();
+        mLoadingAnimatorSet = new AnimatorSet();
         if(isReverse){
-            set.playSequentially(animator2,animator);
+            mLoadingAnimatorSet.playSequentially(animator2,animator);
         }else{
-            set.playSequentially(animator,animator2,mLoadingAnimator);
+            mLoadingAnimatorSet.playSequentially(animator,animator2,loadingAnimator);
         }
-        set.start();
+        mLoadingAnimatorSet.start();
     }
 
     private void playSuccessAnimation(){