diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 016fdd3..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 70e0ec4..8dabc85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,9 @@ profile
 
 DerivedData/
 
+.DS_Store
 
 # CocoaPods
 Pods/
+Podfile.lock
 
diff --git a/JMStatefulTableViewController/JMStatefulTableViewController.m b/JMStatefulTableViewController/JMStatefulTableViewController.m
index 19e0ffb..2aad3c9 100755
--- a/JMStatefulTableViewController/JMStatefulTableViewController.m
+++ b/JMStatefulTableViewController/JMStatefulTableViewController.m
@@ -27,6 +27,10 @@ @interface JMStatefulTableViewController ()
 @property (nonatomic, assign) BOOL isCountingRows;
 @property (nonatomic, assign) BOOL hasAddedPullToRefreshControl;
 
+// Initialization
+
+- (void) _setupStatefulTableViewController;
+
 // Loading
 
 - (void) _loadFirstPage;
@@ -50,15 +54,29 @@ - (id) initWithStyle:(UITableViewStyle)style {
     self = [super initWithStyle:style];
     if (!self) return nil;
 
-    _statefulState = JMStatefulTableViewControllerStateIdle;
-    self.statefulDelegate = self;
+    [self _setupStatefulTableViewController];
+
+    return self;
+}
+
+- (id) initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (!self) return nil;
+
+    [self _setupStatefulTableViewController];
 
     return self;
 }
+
 - (void) dealloc {
     self.statefulDelegate = nil;
 }
 
+- (void) _setupStatefulTableViewController {
+    _statefulState = JMStatefulTableViewControllerStateIdle;
+    _statefulDelegate = self;
+}
+
 #pragma mark - Loading Methods
 
 - (void) loadNewer {
@@ -108,9 +126,12 @@ - (void) _loadNextPage {
             } else {
                 self.statefulState = JMStatefulTableViewControllerStateEmpty;
             }
+
+            [self.tableView.infiniteScrollingView stopAnimating];
         } failure:^(NSError *error) {
             //TODO What should we do here?
             self.statefulState = JMStatefulTableViewControllerStateIdle;
+            [self.tableView.infiniteScrollingView stopAnimating];
         }];
     } else {
         self.tableView.showsInfiniteScrolling = NO;
diff --git a/Podfile.lock b/Podfile.lock
index d9992f5..d99809e 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,11 +1,11 @@
 
-PODS:
+COCOAPODS: 0.16.1
+
+PODS: 
 - SVPullToRefresh (0.4.1)
 
-DEPENDENCIES:
+DEPENDENCIES: 
 - SVPullToRefresh (~> 0.4.1)
 
-SPEC CHECKSUMS:
+SPEC CHECKSUMS: 
   SVPullToRefresh: 61a0e4bd12bd6f8e3465909810b0fbeb1a28d5f2
-
-COCOAPODS: 0.14.0