diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java
index 455166f..2c30317 100644
--- a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java
+++ b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java
@@ -577,14 +577,26 @@ public void startLoadMore() {
      * 结束刷新
      */
     public void finishRefreshing() {
-        cp.finishRefreshing();
+        if (cp.isRefreshing()) {
+            cp.finishRefreshing();
+        }
     }
 
     /**
      * 结束加载更多
      */
     public void finishLoadmore() {
-        cp.finishLoadmore();
+        if (cp.isLoadingMore()) {
+            cp.finishLoadmore();
+        }
+    }
+
+    /**
+     * 同时结束刷新和加载更多
+     */
+    public void finishAll(){
+        finishRefreshing();
+        finishLoadmore();
     }
 
     /**
diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/footer/BallPulseView.java
similarity index 100%
rename from library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java
rename to library/src/main/java/com/lcodecore/tkrefreshlayout/footer/BallPulseView.java
diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/footer/LoadingView.java
similarity index 100%
rename from library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java
rename to library/src/main/java/com/lcodecore/tkrefreshlayout/footer/LoadingView.java