diff --git a/Gemfile.lock b/Gemfile.lock
index d56981e..33c1400 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,3 +60,6 @@ DEPENDENCIES
   motion-cocoapods
   nano-store
   rake
+
+BUNDLED WITH
+   1.10.4
diff --git a/app/app_delegate.rb b/app/app_delegate.rb
index 2e301b4..728c0b5 100644
--- a/app/app_delegate.rb
+++ b/app/app_delegate.rb
@@ -1,7 +1,7 @@
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     documents_path         = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
-    NanoStore.shared_store = NanoStore.store(:file, documents_path + "/nano.db")
+    NanoStore.shared_store = NanoStore.store(:file, documents_path + "/nano1.db")
 
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
 
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index c01437f..fb51774 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -1,6 +1,7 @@
 class ListController < UIViewController
   def viewDidLoad
     super
+    self.title = "Todo"
     self.view.backgroundColor = UIColor.whiteColor
     list_view = ListView.alloc.initWithFrame(self.view.frame)
     self.view.addSubview(list_view)
diff --git a/app/views/list_view.rb b/app/views/list_view.rb
index 0f6b026..dfbd363 100644
--- a/app/views/list_view.rb
+++ b/app/views/list_view.rb
@@ -51,10 +51,10 @@ def add_task
   end
 
   def add_task_list
-    table_view = UITableView.alloc.initWithFrame(CGRectMake(0, 70, self.frame.size.width, 200))
+    table_view = UITableView.alloc.initWithFrame([[0, 70], [self.bounds.size.width, self.bounds.size.height - 70]], style: UITableViewStyleGrouped)
     table_view.dataSource = self
     table_view.delegate = self
-    table_view.clipsToBounds = false
+    table_view.clipsToBounds = true
     self.task_list = table_view
     self.addSubview table_view
   end
@@ -81,16 +81,22 @@ def tableView(tableView, cellForRowAtIndexPath: indexPath)
 
     @reuseIdentifier ||= "cell"
     cell = tableView.dequeueReusableCellWithIdentifier(@reuseIdentifier)
-    cell ||= UITableViewCell.alloc.initWithStyle(UITableViewCellStyleDefault, reuseIdentifier: @reuseIdentifier)
+    cell ||= UITableViewCell.alloc.initWithStyle(UITableViewCellStyleSubtitle, reuseIdentifier: @reuseIdentifier)
 
     if indexPath.section == 0
       cell.textLabel.text = "#{self.uncompleted_tasks[indexPath.row].name}"
+      cell.detailTextLabel.text = format_time self.uncompleted_tasks[indexPath.row].created_at
     elsif indexPath.section == 1
       cell.textLabel.text = "#{self.completed_tasks[indexPath.row].name}"
+      cell.detailTextLabel.text = format_time self.completed_tasks[indexPath.row].created_at
     end
     cell
   end
 
+  def format_time time
+    timestamp = time.strftime("Created on %m/%d/%Y") + time.strftime(" at %I:%M:%S%p")
+  end
+
   def tableView(tableView, numberOfRowsInSection: section)
     if section == 0
       Task.find(:completed, NSFEqualTo, 0).count
@@ -105,12 +111,23 @@ def tableView(tableView, numberOfRowsInSection: section)
   def tableView(tableView, didSelectRowAtIndexPath: indexPath)
     tableView.deselectRowAtIndexPath(indexPath, animated: true)
     cell = tableView.cellForRowAtIndexPath(indexPath)
-    self.mark_as_done(cell)
+    self.mark_as_done(cell, indexPath)
   end
 
 
-  def mark_as_done cell
-    task = Task.find(:name, NSFEqualTo, cell.textLabel.text).first
+  def mark_as_done cell, indexPath
+    tasks = Task.find(:name, NSFEqualTo, cell.textLabel.text)
+    task = Task.new
+    if indexPath.section == 0
+      timestamp = self.uncompleted_tasks[indexPath.row].created_at
+    else
+      timestamp = self.completed_tasks[indexPath.row].created_at
+    end
+
+    tasks.each do |t|
+      task = t if t.created_at == timestamp
+    end
+
     task.completed = !task.completed
     task.save
     self.reload_table_sections
diff --git a/vendor/Podfile.lock b/vendor/Podfile.lock
index 12b60ac..ea1da9f 100644
--- a/vendor/Podfile.lock
+++ b/vendor/Podfile.lock
@@ -1,10 +1,11 @@
 PODS:
-  - NanoStore (2.7.7)
+  - NanoStore (2.6.4)
 
 DEPENDENCIES:
   - NanoStore
+  - NanoStore (~> 2.6.0)
 
 SPEC CHECKSUMS:
-  NanoStore: e4d261a90d33dc7e4e0582fd28241828ebe5eaf6
+  NanoStore: a79dfd7c141d9cc0fc826661f227edcf43375d10
 
 COCOAPODS: 0.37.1
diff --git a/vendor/Pods/.build/libPods-NanoStore.a b/vendor/Pods/.build/libPods-NanoStore.a
index 0bdbb27..8b05929 100644
Binary files a/vendor/Pods/.build/libPods-NanoStore.a and b/vendor/Pods/.build/libPods-NanoStore.a differ
diff --git a/vendor/Pods/.build/libPods.a b/vendor/Pods/.build/libPods.a
index 46e3e4a..359d1d2 100644
Binary files a/vendor/Pods/.build/libPods.a and b/vendor/Pods/.build/libPods.a differ
diff --git a/vendor/Pods/Headers/Public/____Pods-environment.h b/vendor/Pods/Headers/Public/____Pods-environment.h
index ed5898e..ab41541 100644
--- a/vendor/Pods/Headers/Public/____Pods-environment.h
+++ b/vendor/Pods/Headers/Public/____Pods-environment.h
@@ -9,6 +9,6 @@
 // NanoStore
 #define COCOAPODS_POD_AVAILABLE_NanoStore
 #define COCOAPODS_VERSION_MAJOR_NanoStore 2
-#define COCOAPODS_VERSION_MINOR_NanoStore 7
-#define COCOAPODS_VERSION_PATCH_NanoStore 7
+#define COCOAPODS_VERSION_MINOR_NanoStore 6
+#define COCOAPODS_VERSION_PATCH_NanoStore 4
 
diff --git a/vendor/Pods/Manifest.lock b/vendor/Pods/Manifest.lock
index 12b60ac..ea1da9f 100644
--- a/vendor/Pods/Manifest.lock
+++ b/vendor/Pods/Manifest.lock
@@ -1,10 +1,11 @@
 PODS:
-  - NanoStore (2.7.7)
+  - NanoStore (2.6.4)
 
 DEPENDENCIES:
   - NanoStore
+  - NanoStore (~> 2.6.0)
 
 SPEC CHECKSUMS:
-  NanoStore: e4d261a90d33dc7e4e0582fd28241828ebe5eaf6
+  NanoStore: a79dfd7c141d9cc0fc826661f227edcf43375d10
 
 COCOAPODS: 0.37.1
diff --git a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.h b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.h
index 86bf285..546cc9f 100644
--- a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.h
+++ b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.h
@@ -281,11 +281,11 @@
  @see NSFNanoEngine
  */
 
-- (NSFJournalModeMode)journalModeAndReturnError:(NSError * __autoreleasing *)outError;
+- (NSFJournalModeMode)journalModeAndReturnError:(out NSError **)outError;
 
 /** Returns the journal mode.
  * @return The current journal mode.
- * @see - (NSFJournalModeMode)journalModeAndReturnError:(NSError * __autoreleasing *)outError;
+ * @see - (NSFJournalModeMode)journalModeAndReturnError:(out NSError **)outError;
  */
 - (BOOL)setJournalMode:(NSFJournalModeMode)theMode;
 
diff --git a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m
index bb7e725..941dad0 100644
--- a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m
+++ b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m
@@ -145,7 +145,7 @@ - (NSString *)JSONDescription
 - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)useFastMode
 {
     int status = sqlite3_open_v2( [_path UTF8String], &_sqlite,
-                                 SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL);
+                                 SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_AUTOPROXY | SQLITE_OPEN_FULLMUTEX, NULL);
     
     // Set NanoStoreEngine's page size to match the system current page size
     if (0 == [[self tables]count]) {
@@ -173,7 +173,7 @@ - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)use
     } else {
         
         // Set FastMode accordingly...
-        if (useFastMode) {
+        if (YES == useFastMode) {
             sqlite3_exec(self.sqlite, "PRAGMA fullfsync = OFF;", NULL, NULL, NULL);
             sqlite3_exec(self.sqlite, "PRAGMA synchronous = OFF;", NULL, NULL, NULL);
             sqlite3_exec(self.sqlite, "PRAGMA journal_mode = MEMORY;", NULL, NULL, NULL);
@@ -207,7 +207,7 @@ - (BOOL)close
         return NO;
     }
     
-    if ([self isTransactionActive]) {
+    if (YES == [self isTransactionActive]) {
         [self rollbackTransaction];
     }
     
@@ -245,7 +245,7 @@ - (BOOL)isDatabaseOpen
 
 - (BOOL)beginTransaction
 {
-    if ([self isTransactionActive])
+    if (YES == [self isTransactionActive])
         return NO;
     
     _willCommitChangeSchema = NO;
@@ -255,7 +255,7 @@ - (BOOL)beginTransaction
 
 - (BOOL)beginDeferredTransaction
 {
-    if ([self isTransactionActive])
+    if (YES == [self isTransactionActive])
         return NO;
     
     _willCommitChangeSchema = NO;
@@ -303,6 +303,12 @@ - (BOOL)isTransactionActive
     
     int status = sqlite3_get_autocommit(myDB);
     
+    // Since we're operating with extended result code support, extract the bits
+    // and obtain the regular result code
+    // For more info check: http://www.sqlite.org/c3ref/c_ioerr_access.html
+    
+    status = [NSFNanoEngine NSFP_stripBitsFromExtendedResultCode:status];
+    
     return (0 == status);
 }
 
@@ -399,6 +405,11 @@ - (BOOL)dropTable:(NSString *)table
     NSString *theSQLStatement = [[NSString alloc]initWithFormat:@"DROP TABLE %@;", table];
     BOOL everythingIsFine = (nil == [[self executeSQL:theSQLStatement]error]);
     
+    if (everythingIsFine) {
+        theSQLStatement = [[NSString alloc]initWithFormat:@"DELETE FROM %@ WHERE %@ = '%@';", NSFP_SchemaTable, NSFP_TableIdentifier, table];
+        everythingIsFine = (nil == [[self executeSQL:theSQLStatement]error]);
+    }
+    
     if (transactionSetHere) {
         if (everythingIsFine)
             [self commitTransaction];
@@ -449,13 +460,24 @@ - (void)dropIndex:(NSString *)indexName
 
 - (NSArray *)tables
 {
-    return [self NSFP_flattenAllTables];
+    NSArray *allTables = [self NSFP_flattenAllTables];
+    if ([allTables count] == 0)
+        return allTables;
+    
+    // Remove NSF's private table
+    NSMutableArray *tempTables = [NSMutableArray arrayWithArray:allTables];
+    [tempTables removeObject:NSFP_SchemaTable];
+    
+    return tempTables;
 }
 
 - (NSDictionary *)allTables
 {
     NSMutableDictionary *allTables = [NSMutableDictionary dictionary];
     
+    // Make sure we obtain full column names
+    [self NSFP_setFullColumnNamesEnabled];
+    
     NSFNanoResult *databasesResult = [self executeSQL:@"PRAGMA database_list"];
     NSArray *databases = [databasesResult valuesForColumn:@"name"];
     
@@ -464,7 +486,7 @@ - (NSDictionary *)allTables
         NSFNanoResult* result = [self executeSQL:theSQLStatement];
         if (nil == [result error]) {
             // Get all tables in the database
-            NSArray *databaseTables = [result valuesForColumn:@"tbl_name"];
+            NSArray *databaseTables = [result valuesForColumn:@"sqlite_master.tbl_name"];
             NSSet *tablesPerDatabase = [NSSet setWithArray:databaseTables];
             [allTables setObject: [tablesPerDatabase allObjects] forKey: database];
         }
@@ -523,7 +545,7 @@ - (NSArray *)indexes
 {
     NSFNanoResult* result = [self executeSQL:@"SELECT name FROM sqlite_master WHERE type='index' ORDER BY name"];
     
-    return [result valuesForColumn:@"name"];
+    return [result valuesForColumn:@"sqlite_master.name"];
 }
 
 - (NSArray *)indexedColumnsForTable:(NSString *)table
@@ -536,16 +558,16 @@ - (NSArray *)indexedColumnsForTable:(NSString *)table
     NSFNanoResult* result = [self executeSQL:[NSString stringWithFormat:@"SELECT sqlite_master.name FROM sqlite_master WHERE type = 'index' AND sqlite_master.tbl_name = '%@';", table]];
     if ([result numberOfRows] == 0) {
         result = [self executeSQL:[NSString stringWithFormat:@"SELECT sqlite_temp_master.name FROM sqlite_temp_master WHERE type = 'index' AND sqlite_temp_master.tbl_name = '%@';", table]];
-        return [result valuesForColumn:@"name"];
+        return [result valuesForColumn:@"sqlite_temp_master.name"];
     }
     
-    return [result valuesForColumn:@"name"];
+    return [result valuesForColumn:@"sqlite_master.name"];
 }
 
 - (NSArray *)temporaryTables
 {
     NSFNanoResult* result = [self executeSQL:@"SELECT * FROM sqlite_temp_master"]; 
-    return [[NSSet setWithArray:[result valuesForColumn:@"tbl_name"]]allObjects];
+    return [[NSSet setWithArray:[result valuesForColumn:@"sqlite_temp_master.tbl_name"]]allObjects];
 }
 
 - (NSFNanoResult *)executeSQL:(NSString *)theSQLStatement
@@ -587,8 +609,6 @@ - (NSFNanoResult *)executeSQL:(NSString *)theSQLStatement
             int columnIndex, numColumns = sqlite3_column_count (theSQLiteStatement);
             
             while (SQLITE_ROW == sqlite3_step (theSQLiteStatement)) {
-                
-                id value = nil;
                 for (columnIndex = 0; columnIndex < numColumns; columnIndex++) {
                     // Safety check: obtain the column and value. If the column is NULL, skip the iteration.
                     char *columnUTF8 = (char *)sqlite3_column_name (theSQLiteStatement, columnIndex);
@@ -598,37 +618,36 @@ - (NSFNanoResult *)executeSQL:(NSString *)theSQLStatement
                     NSString *column = [[NSString alloc]initWithUTF8String:columnUTF8];
 
                     // Sanity check: some queries return NULL, which would cause a crash below.
-                    if ([column isEqualToString:NSFKeyedArchive]) {
+                    if ([column isEqualToString:@"NSFKeys.NSFKeyedArchive"]) {
                         //KeyedArchive is a blob
-                        value = [[NSData alloc] initWithBytes:sqlite3_column_blob(theSQLiteStatement, columnIndex) length: sqlite3_column_bytes(theSQLiteStatement, 1)];
+                        NSData *dictBinData = [[NSData alloc] initWithBytes:sqlite3_column_blob(theSQLiteStatement, columnIndex) length: sqlite3_column_bytes(theSQLiteStatement, 1)];
+                        
+                        // Obtain the array to collect the values. If the array doesn't exist, create it.
+                        NSMutableArray *values = [info objectForKey:column];
+                        if (nil == values) {
+                            values = [NSMutableArray new];
+                        }
+                        [values addObject:dictBinData];
+                        [info setObject:values forKey:column];
                     }else
                     {
                         char *valueUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, columnIndex);
+                        NSString *value = nil;
                         if (NULL != valueUTF8) {
                             value = [[NSString alloc]initWithUTF8String:valueUTF8];
                         } else {
                             value = [[NSNull null]description];
                         }
-                    }
-
-                    // Obtain the array to collect the values. If the array doesn't exist, create it.
-                    NSMutableArray *values = [info objectForKey:column];
-                    if (nil == values) {
-                        values = [NSMutableArray new];
+                        
+                        // Obtain the array to collect the values. If the array doesn't exist, create it.
+                        NSMutableArray *values = [info objectForKey:column];
+                        if (nil == values) {
+                            values = [NSMutableArray new];
+                        }
+                        [values addObject:value];
                         [info setObject:values forKey:column];
                     }
-                    
-                    /* Do the safety dance: don't attempt to add a nil object to the values array... */
-                    
-                    if (value == nil) {
-                        id exceptionInfo = @{
-                                             @"SQL statement" : theSQLStatement,
-                                             @"requested column" : column,
-                                             };
-                        [[NSException exceptionWithName:NSInternalInconsistencyException reason:@"failed to get object value for column" userInfo:exceptionInfo]raise];
-                    }
-                    
-                    [values addObject:value];
+
                     
                     // Let's cleanup. This will keep the memory footprint low...
                 }
@@ -733,7 +752,7 @@ - (BOOL)setCacheSize:(NSUInteger)numberOfPages
     if (numberOfPages < 1000)
         numberOfPages = 1000;
     
-    [self executeSQL:[NSString stringWithFormat:@"PRAGMA cache_size = %lu", (unsigned long)numberOfPages]];
+    [self executeSQL:[NSString stringWithFormat:@"PRAGMA cache_size = %ld", numberOfPages]];
     NSUInteger cacheSize = [self cacheSize];
     return (cacheSize == numberOfPages);
 }
@@ -747,7 +766,7 @@ - (NSUInteger)cacheSize
 
 - (BOOL)setPageSize:(NSUInteger)numberOfBytes
 {
-    [self executeSQL:[NSString stringWithFormat:@"PRAGMA page_size = %lu", (unsigned long)numberOfBytes]];
+    [self executeSQL:[NSString stringWithFormat:@"PRAGMA page_size = %ld", numberOfBytes]];
     NSUInteger pageSize = [self pageSize];
     return (pageSize == numberOfBytes);
 }
@@ -787,9 +806,9 @@ + (NSFEncodingType)NSStringToNSFEncodingType:(NSString *)value
 {
     NSFEncodingType convertedValue = NSFEncodingUnknown;
     
-    if ([value isEqualToString:@"UTF-8"]) {
+    if (YES == [value isEqualToString:@"UTF-8"]) {
         convertedValue = NSFEncodingUTF8;
-    } else if ([value isEqualToString:@"UTF-16"]) {
+    } else if (YES == [value isEqualToString:@"UTF-16"]) {
         convertedValue = NSFEncodingUTF16;
     }
     
@@ -852,7 +871,7 @@ - (void)setTempStoreMode:(NSFTempStoreMode)mode
     }
 }
 
-- (NSFJournalModeMode)journalModeAndReturnError:(NSError * __autoreleasing *)outError
+- (NSFJournalModeMode)journalModeAndReturnError:(out NSError **)outError
 {
     NSFNanoResult *result = [self executeSQL:@"PRAGMA journal_mode; "];
     if (nil != [result error]) {
@@ -873,7 +892,7 @@ - (NSFJournalModeMode)journalModeAndReturnError:(NSError * __autoreleasing *)out
 
 - (BOOL)setJournalMode:(NSFJournalModeMode)theMode
 {
-    if ([self isTransactionActive]) {
+    if (YES == [self isTransactionActive]) {
         return NO;
     }
     
@@ -1134,6 +1153,67 @@ + (void)NSFP_decodeQuantum:(unsigned char*)dest andSource:(const char *)src
     dest[0] = (unsigned char)(x & 255);
 }
 
+- (NSFNanoDatatype)NSFP_datatypeForColumn:(NSString *)tableAndColumn
+{
+    if (nil == tableAndColumn)
+        [[NSException exceptionWithName:NSFUnexpectedParameterException
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableAndColumn is nil.", [self class], NSStringFromSelector(_cmd)]
+                               userInfo:nil]raise];
+    
+    NSString  *table = [self NSFP_prefixWithDotDelimiter:tableAndColumn];
+    NSString  *column = [self NSFP_suffixWithDotDelimiter:tableAndColumn];
+    
+    return [self NSFP_datatypeForTable:(NSString *)table column:(NSString *)column];
+}
+
+- (NSFNanoDatatype)NSFP_datatypeForTable:(NSString *)table column:(NSString *)column
+{
+    if (nil == table)
+        [[NSException exceptionWithName:NSFUnexpectedParameterException
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
+                               userInfo:nil]raise];
+    
+    if (nil == column)
+        [[NSException exceptionWithName:NSFUnexpectedParameterException
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
+                               userInfo:nil]raise];
+    
+    NSString  *datatype = nil;
+    
+    // Check to see if the schema has been cached; take advantage of it if possible...
+    if (nil != _schema) {
+        datatype = [[_schema objectForKey:table]objectForKey:column];
+        if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
+    } else {
+        NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ from %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
+        
+        NSFNanoResult* result = [self executeSQL:theSQLStatement];
+        
+        datatype = [[result valuesForColumn:NSFP_FullDatatypeIdentifier]lastObject];
+                    
+        if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
+
+        NSMutableDictionary *tempSchema = [_schema objectForKey:table];
+        if (nil != tempSchema)
+            tempSchema = [[NSMutableDictionary alloc]init];
+        else
+            ;
+        
+        [tempSchema setObject:datatype forKey:column];
+        [_schema setObject:tempSchema forKey:table];
+        
+        tempSchema = nil;
+    }
+
+    return NSFNanoDatatypeFromString(datatype);
+}
+
+- (void)NSFP_setFullColumnNamesEnabled
+{
+    [self executeSQL:@"PRAGMA short_column_names = OFF;"];
+    [self executeSQL:@"PRAGMA full_column_names = ON;"];
+}
+
 - (NSArray *)NSFP_flattenAllTables
 {
     NSMutableSet *flattenedTables = [[NSMutableSet alloc]init];
@@ -1145,7 +1225,7 @@ - (NSArray *)NSFP_flattenAllTables
     while ((database = [enumerator nextObject])) {
         NSArray *databaseTables = [allTables objectForKey:database];
         
-        if (addPrefix && ([database hasPrefix:@"main"] == NO)) {
+        if ((YES == addPrefix) && ([database hasPrefix:@"main"] == NO)) {
             for (NSString *table in databaseTables) {
                 [flattenedTables addObject:[NSString stringWithFormat:@"%@.%@", database, table]];
             }
@@ -1294,17 +1374,29 @@ - (BOOL)NSFP_createTable:(NSString *)table withColumns:(NSArray *)tableColumns d
     BOOL everythingIsFine = YES;
     
     NSMutableString* theSQLStatement;
-    if (isTemporaryFlag)
+    if (YES == isTemporaryFlag)
         theSQLStatement = [[NSMutableString alloc]initWithString:[NSString stringWithFormat:@"CREATE TEMPORARY TABLE %@(", table]];
     else
         theSQLStatement = [[NSMutableString alloc]initWithString:[NSString stringWithFormat:@"CREATE TABLE %@(", table]];
     
     NSMutableArray *tableCreationDatatypes = [NSMutableArray arrayWithArray:revisedDatatypes];
     
-    if ([self NSFP_sqlString:theSQLStatement forTable:table withColumns:revisedColumns datatypes:tableCreationDatatypes]) {
+    if (YES == [self NSFP_sqlString:theSQLStatement forTable:table withColumns:revisedColumns datatypes:tableCreationDatatypes]) {
         [theSQLStatement appendString:@");"];
         
         everythingIsFine = (nil == [[self executeSQL:theSQLStatement]error]);
+        
+        if (everythingIsFine) {
+            // Now add the entries to NSFP_SchemaTable
+            NSInteger i, count = [revisedDatatypes count];
+            
+            for (i = 0; i < count; i++) {
+                if (NO == [self NSFP_insertStringValues:[NSArray arrayWithObjects:table, [revisedColumns objectAtIndex:i], [revisedDatatypes objectAtIndex:i], nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable]) {
+                    everythingIsFine = NO;
+                    break;
+                }
+            }
+        }
     } else {
         everythingIsFine = NO;
     }
@@ -1466,11 +1558,10 @@ - (BOOL)NSFP_insertStringValues:(NSArray *)values forColumns:(NSArray *)columns
         NSString  *column = [revisedColumns objectAtIndex:i];
         NSString  *value = [values objectAtIndex:i];
         NSString  *escapedValue = nil;
-        if ([column isEqualToString:@"ROWID"]) {
-            escapedValue = [[NSString alloc]initWithFormat:@"%@", value];
-        } else {
+        if (NO == [self NSFP_isColumnROWIDAlias:column forTable:table])
             escapedValue = [[NSString alloc]initWithFormat:@"'%@'", value];
-        }
+        else
+            escapedValue = [[NSString alloc]initWithFormat:@"%@", value];
         [escapedValues addObject:escapedValue];
     }
     
@@ -1624,6 +1715,32 @@ - (NSInteger)NSFP_ROWIDPresenceLocation:(NSArray *)tableColumns datatypes:(NSArr
     return ROWIDIndex;
 }
 
+- (BOOL)NSFP_isColumnROWIDAlias:(NSString *)column forTable:(NSString *)table
+{
+    if (nil == column)
+        [[NSException exceptionWithName:NSFUnexpectedParameterException
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
+                               userInfo:nil]raise];
+    
+    if (nil == table)
+        [[NSException exceptionWithName:NSFUnexpectedParameterException
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
+                               userInfo:nil]raise];
+    
+    NSString *rowUIDDatatype = NSFStringFromNanoDataType(NSFNanoTypeRowUID);
+    
+    if (nil != _schema)
+        return [[[_schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
+    
+    NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ FROM %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
+    NSFNanoResult* result = [self executeSQL:theSQLStatement];
+    
+    NSString  *columnFound = [[result valuesForColumn:NSFP_FullDatatypeIdentifier]lastObject];
+    BOOL isROWIDAlias = [columnFound isEqualToString:rowUIDDatatype];
+    
+    return isROWIDAlias;
+}
+
 - (NSString *)NSFP_prefixWithDotDelimiter:(NSString *)tableAndColumn
 {
     if (nil == tableAndColumn)
diff --git a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m
index 559e30e..22e4f73 100644
--- a/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m
+++ b/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m
@@ -63,7 +63,7 @@ - (NSString *)description
     NSMutableString *description = [NSMutableString string];
     [description appendString:@"\n"];
     [description appendString:[NSString stringWithFormat:@"Result address     : %p\n", self]];
-    [description appendString:[NSString stringWithFormat:@"Number of columns  : %lu\n", (unsigned long)numberOfColumns]];
+    [description appendString:[NSString stringWithFormat:@"Number of columns  : %ld\n", numberOfColumns]];
     if (nil == _error)
         if ([[self columns]count] > 0)
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", [[self columns]componentsJoinedByString:@", "]]];
@@ -71,7 +71,7 @@ - (NSString *)description
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", @"()"]];
         else
             [description appendString:[NSString stringWithFormat:@"Columns            : %@\n", @"<column info not available>"]];
-    [description appendString:[NSString stringWithFormat:@"Number of rows     : %lu\n", (unsigned long)_numberOfRows]];
+    [description appendString:[NSString stringWithFormat:@"Number of rows     : %ld\n", _numberOfRows]];
     if (nil == _error)
         [description appendString:[NSString stringWithFormat:@"Error              : %@\n", @"<no error>"]];
     else
@@ -115,7 +115,7 @@ - (NSString *)description
             }
             
             for (i = 0; i < numberOfRowsToPrint; i++) {
-                [description appendString:[NSString stringWithFormat:@"%-15lu | ", (unsigned long)i]];
+                [description appendString:[NSString stringWithFormat:@"%-15ld | ", i]];
                 for (j = 0; j < numberOfColumns; j++) {
                     NSString *columnName = [columns objectAtIndex:j];
                     const char *value = "<plist data>    ";
@@ -208,7 +208,7 @@ - (NSFOrderedDictionary *)dictionaryDescription
             [contentString setString:@""];
 
             for (i = 0; i < numberOfRowsToPrint; i++) {
-                [contentString appendString:[NSString stringWithFormat:@"%-15lu | ", (unsigned long)i]];
+                [contentString appendString:[NSString stringWithFormat:@"%-15ld | ", i]];
                 for (j = 0; j < numberOfColumns; j++) {
                     NSString *columnName = [columns objectAtIndex:j];
                     const char *value = "<plist data>    ";
diff --git a/vendor/Pods/NanoStore/Classes/Private/NSFNanoBag_Private.h b/vendor/Pods/NanoStore/Classes/Private/NSFNanoBag_Private.h
index 1ea0359..fc66f3a 100644
--- a/vendor/Pods/NanoStore/Classes/Private/NSFNanoBag_Private.h
+++ b/vendor/Pods/NanoStore/Classes/Private/NSFNanoBag_Private.h
@@ -30,7 +30,7 @@
 
 @interface NSFNanoBag (Private)
 - (void)_setStore:(NSFNanoStore *)aStore;
-- (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(NSError * __autoreleasing *)outError;
+- (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(out NSError **)outError;
 - (void)_inflateObjectsWithKeys:(NSArray *)someKeys;
 @end
 
diff --git a/vendor/Pods/NanoStore/Classes/Private/NSFNanoEngine_Private.h b/vendor/Pods/NanoStore/Classes/Private/NSFNanoEngine_Private.h
index 8eda723..e711fe7 100644
--- a/vendor/Pods/NanoStore/Classes/Private/NSFNanoEngine_Private.h
+++ b/vendor/Pods/NanoStore/Classes/Private/NSFNanoEngine_Private.h
@@ -40,9 +40,12 @@
 - (NSString *)NSFP_cacheMethodToString;
 - (NSString*)NSFP_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;
 + (NSDictionary *)_plistToDictionary:(NSString *)aPlist;
+- (NSFNanoDatatype)NSFP_datatypeForTable:(NSString *)table column:(NSString *)column;
 + (void)NSFP_decodeQuantum:(unsigned char *)dest andSource:(const char *)src;
+- (void)NSFP_setFullColumnNamesEnabled;
 - (NSArray *)NSFP_flattenAllTables;
 - (NSInteger)NSFP_prepareSQLite3Statement:(sqlite3_stmt **)aStatement theSQLStatement:(NSString *)aSQLQuery;
+- (NSFNanoDatatype)NSFP_datatypeForColumn:(NSString *)tableAndColumn;
 + (int)NSFP_stripBitsFromExtendedResultCode:(int)extendedResult;
 
 - (BOOL)NSFP_beginTransactionMode:(NSString *)theSQLStatement;
@@ -56,6 +59,7 @@
 - (BOOL)NSFP_sqlString:(NSMutableString*)theSQLStatement forTable:(NSString *)table withColumns:(NSArray *)columns datatypes:(NSArray *)datatypes;
 
 - (NSInteger)NSFP_ROWIDPresenceLocation:(NSArray *)tableColumns datatypes:(NSArray *)datatypes;
+- (BOOL)NSFP_isColumnROWIDAlias:(NSString *)column forTable:(NSString *)table;
 
 - (NSString *)NSFP_prefixWithDotDelimiter:(NSString *)tableAndColumn;
 - (NSString *)NSFP_suffixWithDotDelimiter:(NSString *)tableAndColumn;
diff --git a/vendor/Pods/NanoStore/Classes/Private/NSFNanoGlobals_Private.h b/vendor/Pods/NanoStore/Classes/Private/NSFNanoGlobals_Private.h
index f044f4f..39ed913 100644
--- a/vendor/Pods/NanoStore/Classes/Private/NSFNanoGlobals_Private.h
+++ b/vendor/Pods/NanoStore/Classes/Private/NSFNanoGlobals_Private.h
@@ -94,7 +94,10 @@ extern NSInteger const NSF_Private_MacOSXErrorCodeKey;
 extern NSString * const NSFP_TableIdentifier;
 extern NSString * const NSFP_ColumnIdentifier;
 extern NSString * const NSFP_DatatypeIdentifier;
+extern NSString * const NSFP_FullDatatypeIdentifier;
 
 extern NSString * const NSFRowIDColumnName;         // SQLite's standard UID property
 
+extern NSString * const NSFP_SchemaTable;           // Private, reserved NSF table name to store datatypes
+
 /** \endcond */
\ No newline at end of file
diff --git a/vendor/Pods/NanoStore/Classes/Private/NSFNanoSearch_Private.h b/vendor/Pods/NanoStore/Classes/Private/NSFNanoSearch_Private.h
index b645ea7..00f5d42 100644
--- a/vendor/Pods/NanoStore/Classes/Private/NSFNanoSearch_Private.h
+++ b/vendor/Pods/NanoStore/Classes/Private/NSFNanoSearch_Private.h
@@ -29,10 +29,10 @@
 /** \cond */
 
 @interface NSFNanoSearch (Private)
-- (NSDictionary *)_retrieveDataWithError:(NSError * __autoreleasing *)outError;
+- (NSDictionary *)_retrieveDataWithError:(out NSError **)outError;
 - (NSArray *)_dataWithKey:(NSString *)aKey attribute:(NSString *)anAttribute value:(NSString *)aValue matching:(NSFMatchType)match;
 - (NSArray *)_dataWithKey:(NSString *)aKey attribute:(NSString *)anAttribute value:(NSString *)aValue matching:(NSFMatchType)match returning:(NSFReturnType)returnedObjectType;
-- (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(NSError * __autoreleasing *)outError;
+- (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(out NSError **)outError;
 - (NSString *)_preparedSQL;
 - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString *)anAttribute value:(id)aValue matching:(NSFMatchType)match;
 - (NSString *)_prepareSQLQueryStringWithExpressions:(NSArray *)someExpressions;
diff --git a/vendor/Pods/NanoStore/Classes/Private/NSFNanoStore_Private.h b/vendor/Pods/NanoStore/Classes/Private/NSFNanoStore_Private.h
index 032b205..88ee0b1 100644
--- a/vendor/Pods/NanoStore/Classes/Private/NSFNanoStore_Private.h
+++ b/vendor/Pods/NanoStore/Classes/Private/NSFNanoStore_Private.h
@@ -34,15 +34,15 @@
 + (NSFNanoStore *)_createAndOpenDebugDatabase;
 - (NSFNanoResult *)_executeSQL:(NSString *)theSQLStatement;
 - (NSString*)_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;
-- (BOOL)_initializePreparedStatementsWithError:(NSError * __autoreleasing *)outError;
+- (BOOL)_initializePreparedStatementsWithError:(out NSError **)outError;
 - (void)_releasePreparedStatements;
 - (void)_setIsOurTransaction:(BOOL)value;
 - (BOOL)_isOurTransaction;
 - (BOOL)_setupCachingSchema;
-- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(NSError * __autoreleasing *)outError;
-- (BOOL)__storeDictionaries:(NSArray *)someObjects forKeys:(NSArray *)someKeys error:(NSError * __autoreleasing *)outError;
+- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(out NSError **)outError;
+- (BOOL)__storeDictionaries:(NSArray *)someObjects forKeys:(NSArray *)someKeys error:(out NSError **)outError;
 - (BOOL)_bindValue:(id)aValue forAttribute:(NSString *)anAttribute parameterNumber:(NSInteger)aParamNumber usingSQLite3Statement:(sqlite3_stmt *)aStatement;
-- (BOOL)_checkNanoStoreIsReadyAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)_checkNanoStoreIsReadyAndReturnError:(out NSError **)outError;
 - (NSFNanoDatatype)_NSFDatatypeOfObject:(id)value;
 - (NSString *)_stringFromValue:(id)aValue;
 + (NSString *)_calendarDateToString:(NSDate *)aDate;
@@ -50,10 +50,10 @@
 - (void)_flattenCollection:(id)someObject keyPath:(NSMutableArray **)aKeyPath keys:(NSMutableArray **)someKeys values:(NSMutableArray **)someValues;
 - (BOOL)_prepareSQLite3Statement:(sqlite3_stmt **)aStatement theSQLStatement:(NSString *)aSQLQuery;
 - (void)_executeSQLite3StepUsingSQLite3Statement:(sqlite3_stmt *)aStatement;
-- (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave error:(NSError * __autoreleasing *)outError;
+- (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave error:(out NSError **)outError;
 + (NSDictionary *)_defaultTestData;
-- (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)aPath extension:(NSString *)anExtension compact:(BOOL)flag error:(NSError * __autoreleasing *)outError;
-- (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)aPath extension:(NSString *)anExtension compact:(BOOL)flag error:(NSError * __autoreleasing *)outError;
+- (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)aPath extension:(NSString *)anExtension compact:(BOOL)flag error:(out NSError **)outError;
+- (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)aPath extension:(NSString *)anExtension compact:(BOOL)flag error:(out NSError **)outError;
 @end
 
 /** \endcond */
\ No newline at end of file
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.h b/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.h
index 6998e15..2b034ab 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.h
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.h
@@ -146,10 +146,10 @@
  * @return YES upon success, NO otherwise.
  * @warning This value cannot be nil and it must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
  * @throws NSFNonConformingNanoObjectProtocolException is thrown if the object is non-\link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink compliant.
- * @see \link addObjectsFromArray:error: - (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link addObjectsFromArray:error: - (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
  */
 
-- (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError;
+- (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError;
 
 /** * Adds a series of \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant objects to the bag.
  * @param theObjects is an array of objects to be added to the bag. The objects must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
@@ -157,10 +157,10 @@
  * @return YES upon success, NO otherwise.
  * @warning The objects of the array must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
  * @throws NSFNonConformingNanoObjectProtocolException is thrown if the object is non-\link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink compliant.
- * @see \link addObject:error: - (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link addObject:error: - (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
  */
 
-- (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError;
+- (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(out NSError **)outError;
 
 /** * Removes the specified object from the bag.
  * @param theObject the object to be removed from the bag.
@@ -226,31 +226,31 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note Check property hasUnsavedChanges to find out whether the bag has unsaved contents.
- * @see \link reloadBagWithError: - (BOOL)reloadBagWithError:(NSError * __autoreleasing *)outError \endlink
- * @see \link undoChangesWithError: - (BOOL)undoChangesWithError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link reloadBagWithError: - (BOOL)reloadBagWithError:(out NSError **)outError \endlink
+ * @see \link undoChangesWithError: - (BOOL)undoChangesWithError:(out NSError **)outError \endlink
  */
 
-- (BOOL)saveAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)saveAndReturnError:(out NSError **)outError;
 
 /** * Refreshes the bag to match the contents stored in the document store. The unsaved contents are preserved.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
- * @see \link saveAndReturnError: - (BOOL)saveAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link undoChangesWithError: - (BOOL)undoChangesWithError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link saveAndReturnError: - (BOOL)saveAndReturnError:(out NSError **)outError \endlink
+ * @see \link undoChangesWithError: - (BOOL)undoChangesWithError:(out NSError **)outError \endlink
  */
 
-- (BOOL)reloadBagWithError:(NSError * __autoreleasing *)outError;
+- (BOOL)reloadBagWithError:(out NSError **)outError;
 
 /** * Discards the changes made in the bag.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
- * @see \link saveAndReturnError: - (BOOL)saveAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link reloadBagWithError: - (BOOL)reloadBagWithError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link saveAndReturnError: - (BOOL)saveAndReturnError:(out NSError **)outError \endlink
+ * @see \link reloadBagWithError: - (BOOL)reloadBagWithError:(out NSError **)outError \endlink
  */
 
-- (BOOL)undoChangesWithError:(NSError * __autoreleasing *)outError;
+- (BOOL)undoChangesWithError:(out NSError **)outError;
 
 //@}
 
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m
index 1a79916..877ff93 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m
@@ -208,7 +208,7 @@ - (BOOL)isEqualToNanoBag:(NSFNanoBag *)otherNanoBag
 
 #pragma mark -
 
-- (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(NSError * __autoreleasing *)outError
+- (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(out NSError **)outError
 {
     if (NO == [(id)object conformsToProtocol:@protocol(NSFNanoObjectProtocol)]) {
         [[NSException exceptionWithName:NSFNonConformingNanoObjectProtocolException
@@ -217,7 +217,7 @@ - (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(NSError * __autorele
     }
     
     NSString *objectKey = [(id)object nanoObjectKey];
-    NSDictionary *info = [object nanoObjectDictionaryRepresentation];
+    NSDictionary *info = [(id)object dictionaryRepresentation];
     
     if (objectKey && info) {
         [_savedObjects removeObjectForKey:objectKey];
@@ -237,7 +237,7 @@ - (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(NSError * __autorele
     return YES;
 }
 
-- (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(NSError * __autoreleasing *)outError
+- (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(out NSError **)outError
 {
     if (nil == someObjects) {
         if (nil != outError) {
@@ -331,7 +331,7 @@ - (void)removeObjectsWithKeysInArray:(NSArray *)someKeys
     }
 }
 
-- (BOOL)saveAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)saveAndReturnError:(out NSError **)outError
 {
     if (NO == self.hasUnsavedChanges) {
         return YES;
@@ -368,7 +368,7 @@ - (void)inflateBag
     [self _inflateObjectsWithKeys:objectKeys];
 }
 
-- (BOOL)reloadBagWithError:(NSError * __autoreleasing *)outError
+- (BOOL)reloadBagWithError:(out NSError **)outError
 {
     // If the bag is not associated to a document store, there is no need to continue
     if (nil == _store) {
@@ -397,7 +397,7 @@ - (BOOL)reloadBagWithError:(NSError * __autoreleasing *)outError
     return YES;
 }
 
-- (BOOL)undoChangesWithError:(NSError * __autoreleasing *)outError
+- (BOOL)undoChangesWithError:(out NSError **)outError
 {
     [_savedObjects removeAllObjects];
     [_unsavedObjects removeAllObjects];
@@ -449,7 +449,7 @@ - (void)_setStore:(NSFNanoStore *)aStore
     _store = aStore;
 }
 
-- (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(NSError * __autoreleasing *)outError
+- (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(out NSError **)outError
 {
     // Save the unsaved objects first...
     NSArray *contentsToBeSaved = [_unsavedObjects allValues];
@@ -465,10 +465,10 @@ - (BOOL)_saveInStore:(NSFNanoStore *)someStore error:(NSError * __autoreleasing
     // Save the unsaved bag...
     BOOL success = [someStore _addObjectsFromArray:[NSArray arrayWithObject:self] forceSave:YES error:outError];
     
-    if (success) {
+    if (YES == success) {
         [_unsavedObjects removeAllObjects];
         success = [self reloadBagWithError:outError];
-        if (success) {
+        if (YES == success) {
             _hasUnsavedChanges = NO;
         }
         return success;
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m
index 4d416ef..642ae2e 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m
@@ -141,6 +141,9 @@ void _NSFLog (NSString  *format, ...)
 
 #pragma mark Private section
 
+NSString * const NSFP_SchemaTable                    = @"NSFP_SchemaTable";
 NSString * const NSFP_TableIdentifier                = @"NSFP_TableIdentifier";
 NSString * const NSFP_ColumnIdentifier               = @"NSFP_ColumnIdentifier";
 NSString * const NSFP_DatatypeIdentifier             = @"NSFP_DatatypeIdentifier";
+
+NSString * const NSFP_FullDatatypeIdentifier                = @"NSFP_SchemaTable.NSFP_DatatypeIdentifier";
\ No newline at end of file
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.h b/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.h
index b0ab357..7d1a0d7 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.h
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.h
@@ -153,9 +153,9 @@
  
  To remove an object, there are several options available. The most common methods are found in NSFNanoStore:
  
- - \link NSFNanoStore::removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
- - \link NSFNanoStore::removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink
- - \link NSFNanoStore::removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
+ - \link NSFNanoStore::removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
+ - \link NSFNanoStore::removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink
+ - \link NSFNanoStore::removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
  
  @details <b>Example:</b>
  @code
@@ -311,7 +311,7 @@
  * @return YES upon success, NO otherwise.
  */
 
-- (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)saveStoreAndReturnError:(out NSError **)outError;
 
 /** * Returns a dictionary that contains the information stored in the object.
  * @note Check properties info and key to find out the current state of the object.
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m
index 8a3f8ce..df37ae8 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m
@@ -176,14 +176,14 @@ - (BOOL)isEqualToNanoObject:(NSFNanoObject *)otherNanoObject
         }
     }
     
-    if (success) {
+    if (YES == success) {
         success = [_info isEqualToDictionary:otherNanoObject.info];
     }
     
     return success;
 }
 
-- (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)saveStoreAndReturnError:(out NSError **)outError
 {
     [_store addObject:self error:outError];
     
@@ -256,7 +256,7 @@ + (NSString *)_NSObjectToJSONString:(id)object error:(NSError **)error
         return JSONInfo;
     }
     
-    if (error != nil) {
+    if (*error) {
         *error = tempError;
     }
     
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
index ec0e4e0..4c8db6e 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
@@ -89,7 +89,7 @@ - (NSArray *)arrayDescription
     }
     
     // Make sure we escape quotes if present and the value is a string
-    if ([_value isKindOfClass:[NSString class]]) {
+    if (YES == [_value isKindOfClass:[NSString class]]) {
         _value = [_value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     } else {
         _value = NSFStringFromNanoDataType(NSFNanoTypeNULL);
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h
index c14cb24..948ec80 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h
@@ -73,7 +73,7 @@
  - 3) Obtain the results specifying whether objects or keys should be returned (*)
  
  (*) Request objects if you're interested in the data. Otherwise, you should request keys if you need to feed the result to another method, such as NSFNanoStore
- \link NSFNanoStore::removeObjectsWithKeysInArray:error: -(BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink method.
+ \link NSFNanoStore::removeObjectsWithKeysInArray:error: -(BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink method.
  
  @details <b>Example: finding all objects with the attribute 'LastName' and value 'Doe'.</b>
  @code
@@ -100,7 +100,7 @@
  
  // Remove the NanoObjects matching the selected UUIDs
  NSError *outError = nil;
- if ([nanoStore removeObjectsWithKeysInArray:matchingKeys error:&outError]) {
+ if (YES == [nanoStore removeObjectsWithKeysInArray:matchingKeys error:&outError]) {
  NSLog(@"The matching objects have been removed.");
  } else {
  NSLog(@"An error has occurred while removing the matching objects. Reason: %@", [outError localizedDescription]);
@@ -216,10 +216,10 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return An array is returned if: 1) the sort has been specified or 2) the return type is \link Globals::NSFReturnKeys NSFReturnKeys \endlink. Otherwise, a dictionary is returned.
  * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
- * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
-- (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError;
+- (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError;
 
 /** * Performs a search using the values of the properties before, on or after a given date.
  * @param theDateMatch the type of date comparison. Can be \link Globals::NSFBeforeDate NSFBeforeDate \endlink, \link Globals::NSFOnDate NSFOnDate \endlink or \link Globals::NSFAfterDate NSFAfterDate \endlink.
@@ -228,10 +228,10 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return If theReturnType is \link Globals::NSFReturnObjects NSFReturnObjects \endlink, a dictionary is returned. Otherwise, an array is returned.
  * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
- * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
-- (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError;
+- (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError;
 
 /** * Returns the result of the aggregate function.
  * @param theFunctionType is the function type to be applied.
@@ -290,16 +290,16 @@
  * @see \link executeSQL: - (NSFNanoResult *)executeSQL:(NSString *)theSQLStatement \endlink
  */
 
-- (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError;
+- (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError;
 
 /** * Performs a search with a given SQL statement.
  * @param theSQLStatement is the SQL statement to be executed. Must not be nil or an empty string.
  * @return Returns a NSFNanoResult.
  * @note
  * Use this method when you need to perform more advanced SQL statements. If you just want to query NanoObjects using your own SQL statement,
- * you may want to use \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink instead.
+ * you may want to use \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink instead.
  * @par
- * The key difference between this method and \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink
+ * The key difference between this method and \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  * is that this method doesn't perform any check at all. The SQL statement will be sent verbatim to SQLite.
  * @details <b>Example:</b>
  * @code
@@ -320,7 +320,7 @@
  * // Perform the search
  * NSFNanoResult *result = [search executeSQL:@"SELECT COUNT(*) FROM NSFKEYS"];
  * @endcode
- * @see \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  * @note The sort descriptor will be ignored when executing custom SQL statements.
  */
 
@@ -354,7 +354,7 @@
  * NSFNanoResult *results = [search explainSQL:@"SELECT * FROM NSFValues"];
  * @endcode
  * @see \link executeSQL: - (NSFNanoResult *)executeSQL:(NSString *)theSQLStatement \endlink
- * @see \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link executeSQL:returnType:error: - (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
 - (NSFNanoResult *)explainSQL:(NSString *)theSQLStatement;
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
index 4495e24..44cdff8 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
@@ -85,7 +85,7 @@ - (NSString *)sql
 
 #pragma mark -
 
-- (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError
+- (id)executeSQL:(NSString *)theSQLStatement returnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
     if (nil == theSQLStatement) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
@@ -168,7 +168,7 @@ - (void)reset
 
 #pragma mark -
 
-- (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError
+- (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
     _returnedObjectType = theReturnType;
     
@@ -180,7 +180,7 @@ - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(NSError *
     return [self _sortResultsIfApplicable:results returnType:theReturnType];
 }
 
-- (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(NSError * __autoreleasing *)outError
+- (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
     _returnedObjectType = theReturnType;
     
@@ -245,9 +245,9 @@ - (NSNumber *)aggregateOperation:(NSFAggregateFunctionType)theFunctionType onAtt
 
 /** \cond */
 
-- (NSDictionary *)_retrieveDataWithError:(NSError * __autoreleasing *)outError
+- (NSDictionary *)_retrieveDataWithError:(out NSError **)outError
 {
-    if ([_nanoStore isClosed]) {
+    if (YES == [_nanoStore isClosed]) {
         return nil;
     }
     
@@ -362,7 +362,7 @@ - (NSDictionary *)_retrieveDataWithError:(NSError * __autoreleasing *)outError
                     
                     // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                     // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
-                    if (saveOriginalClassReference) {
+                    if (YES == saveOriginalClassReference) {
                         [nanoObject _setOriginalClassString:objectClass];
                     }
                     
@@ -388,7 +388,7 @@ - (NSDictionary *)_retrieveDataWithError:(NSError * __autoreleasing *)outError
     return searchResults;
 }
 
-- (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(NSError * __autoreleasing *)outError
+- (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(out NSError **)outError
 {
     if ([_nanoStore isClosed] == YES) {
         return nil;
@@ -399,22 +399,22 @@ - (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(
     
     switch (aDateMatch) {
         case NSFBeforeDate:
-            if (_filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ < '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, _filterClass, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ < '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
                 theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ < '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
             break;
         case NSFOnDate:
-            if (_filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ = '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, _filterClass, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ = '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
                 theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ = '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
             break;
         case NSFAfterDate:
-            if (_filterClass.length > 0) {
-                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ > '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, _filterClass, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ > '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
             } else {
                 theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ > '%@'", NSFKey, NSFKeyedArchive, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
             }
@@ -427,14 +427,14 @@ - (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(
     
     if (result.numberOfRows > 0) {
         if (NSFReturnKeys == _returnedObjectType) {
-            NSArray *resultsKeys = [result valuesForColumn:NSFKey];
+            NSArray *resultsKeys = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKey]];
             for (NSString *resultKey in resultsKeys)
                 [searchResults setObject:[NSNull null] forKey:resultKey];
             return searchResults;
         } else {
-                NSArray *resultsObjectClass = [result valuesForColumn:NSFObjectClass];
-                NSArray *resultsObjects = [result valuesForColumn:NSFKeyedArchive];
-                NSArray *resultsKeys = [result valuesForColumn:NSFKey];
+                NSArray *resultsObjectClass = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFObjectClass]];
+                NSArray *resultsObjects = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKeyedArchive]];
+                NSArray *resultsKeys = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKey]];
                 NSUInteger i, count = [resultsKeys count];
                 
             for (i = 0; i < count; i++) {
@@ -455,7 +455,7 @@ - (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(
                         
                         // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                         // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
-                        if (saveOriginalClassReference) {
+                        if (YES == saveOriginalClassReference) {
                             [nanoObject _setOriginalClassString:className];
                         }
                         
@@ -481,12 +481,12 @@ - (NSString *)_preparedSQL
     
     // Add the limit clause if required
     if (_limit > 0) {
-        aSQLQuery = [NSString stringWithFormat:@"%@ LIMIT %lu", aSQLQuery, (unsigned long)_limit];
+        aSQLQuery = [NSString stringWithFormat:@"%@ LIMIT %li", aSQLQuery, _limit];
     }
     
     // Add the offset clause if required
     if (_offset > 0) {
-        aSQLQuery = [NSString stringWithFormat:@"%@ OFFSET %lu", aSQLQuery, (unsigned long)_offset];
+        aSQLQuery = [NSString stringWithFormat:@"%@ OFFSET %li", aSQLQuery, _offset];
     }
     
     return aSQLQuery;
@@ -498,7 +498,7 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
     NSString *attributes = nil;
     
     // Make sure we escape quotes if present and the value is a string
-    if ([aValue isKindOfClass:[NSString class]]) {
+    if (YES == [aValue isKindOfClass:[NSString class]]) {
         aValue = [aValue stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     }
     
@@ -519,18 +519,10 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
     if ((nil == aKey) && (nil == anAttribute) && (nil == aValue)) {
         switch (returnType) {
             case NSFReturnKeys:
-                if (_filterClass.length > 0) {
-                    return [NSString stringWithFormat:@"SELECT NSFKey FROM NSFKeys WHERE (NSFObjectClass = '%@')", _filterClass];
-                } else {
-                    return @"SELECT NSFKEY FROM NSFKeys";
-                }
+                return @"SELECT NSFKEY FROM NSFKeys";
                 break;
             default:
-                if (_filterClass.length > 0) {
-                    return [NSString stringWithFormat:@"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@')", _filterClass];
-                } else {
-                    return @"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys";
-                }
+                return @"SELECT NSFKey, NSFKeyedArchive, NSFObjectClass FROM NSFKeys";
                 break;
         }
     } else {
@@ -561,7 +553,7 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
     }
     
     if (nil != anAttribute) {
-        if (querySegmentWasAdded) {
+        if (YES == querySegmentWasAdded) {
             [theSQLStatement appendString:@" AND "];
         }
         
@@ -588,7 +580,7 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
         }
     } else {
         if (nil != aValue) {
-            if (querySegmentWasAdded)
+            if (YES == querySegmentWasAdded)
                 [theSQLStatement appendString:@" AND "];
             segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:aMatch];
             [theSQLStatement appendString:segment];
@@ -599,19 +591,19 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
         [theSQLStatement appendString:@" ORDER BY ROWID"];
     }
     
-    if (_groupValues) {
+    if (YES == _groupValues) {
         [theSQLStatement appendString:@" GROUP BY NSFValue"];
     }
     
     if (NSFReturnObjects == returnType) {
-        if (_filterClass.length > 0) {
-            theSQLStatement = [NSMutableString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", _filterClass, theSQLStatement];
+        if (self.filterClass.length > 0) {
+            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theSQLStatement];
         } else {
-            theSQLStatement = [NSMutableString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
+            theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
         }
     } else {
-        if (_filterClass.length > 0) {
-            theSQLStatement = [NSMutableString stringWithFormat:@"SELECT (NSFKEY) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKEY IN (%@)", _filterClass, theSQLStatement];
+        if (self.filterClass.length > 0) {
+            theSQLStatement = [NSString stringWithFormat:@"SELECT (NSFKEY) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKEY IN (%@)", self.filterClass, theSQLStatement];
         }
     }
     
@@ -657,14 +649,14 @@ - (NSString *)_prepareSQLQueryStringWithExpressions:(NSArray *)someExpressions
     NSString *theValue = [sqlComponents componentsJoinedByString:@""];
     
     if (NSFReturnObjects == returnType) {
-        if (_filterClass.length > 0) {
-            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", _filterClass, theValue];
+        if (self.filterClass.length > 0) {
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
         } else {
             theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theValue];
         }
     } else {
-        if (_filterClass.length > 0) {
-            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", _filterClass, theValue];
+        if (self.filterClass.length > 0) {
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
         }
     }
     
@@ -684,7 +676,7 @@ + (NSString *)_prepareSQLQueryStringWithKeys:(NSArray *)someKeys
     [theSQLStatement appendString:[preparedKeys componentsJoinedByString:@","]];
     [theSQLStatement appendString:@")"];
     
-    theSQLStatement = [NSMutableString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
+    theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFKeyedArchive,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
     
     return theSQLStatement;
 }
@@ -697,7 +689,7 @@ + (NSString *)_querySegmentForColumn:(NSString *)aColumn value:(id)aValue matchi
     NSInteger mutatedStringLength = 0;
     unichar sentinelChar;
     
-    if ([aValue isKindOfClass:[NSString class]]) {
+    if (YES == [aValue isKindOfClass:[NSString class]]) {
         switch (match) {
             case NSFEqualTo:
                 value = [[NSMutableString alloc]initWithFormat:@"%@ = '%@'", aColumn, aValue];
@@ -749,7 +741,7 @@ + (NSString *)_querySegmentForColumn:(NSString *)aColumn value:(id)aValue matchi
                 [segment appendString:value];
                 break;
         }
-    } else if ([aValue isKindOfClass:[NSArray class]]) {
+    } else if (YES == [aValue isKindOfClass:[NSArray class]]) {
         // Quote the parameters
         NSMutableArray *quotedParameters = [[NSMutableArray alloc]initWithCapacity:[aValue count]];
         value = [[NSMutableString alloc]initWithFormat:@"%@ IN (", aColumn];
@@ -765,7 +757,7 @@ + (NSString *)_querySegmentForColumn:(NSString *)aColumn value:(id)aValue matchi
         [segment appendString:value];
         
         // Free allocated resources
-    } else if ([aValue isKindOfClass:[NSNull class]]){
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]){
         switch (match) {
             case NSFEqualTo:
                 value = [[NSMutableString alloc]initWithFormat:@"%@ IS NULL", aColumn];
@@ -788,7 +780,7 @@ + (NSString *)_querySegmentForAttributeColumnWithValue:(id)anAttributeValue matc
     NSMutableString *segment = [NSMutableString string];
     NSMutableString *value = nil;
 
-    if (([aValue isKindOfClass:[NSString class]]) || (nil == aValue)) {
+    if ((YES == [aValue isKindOfClass:[NSString class]]) || (nil == aValue)) {
         if (nil == aValue) {
             value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@') OR (%@ GLOB '%@.*') OR (%@ GLOB '*.%@.*') OR (%@ GLOB '*.%@'))", NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue];
             [segment appendString:value];
@@ -843,7 +835,7 @@ + (NSString *)_querySegmentForAttributeColumnWithValue:(id)anAttributeValue matc
                     break;
             }
         }
-    } else if ([aValue isKindOfClass:[NSArray class]]) {
+    } else if (YES == [aValue isKindOfClass:[NSArray class]]) {
         // Quote the parameters
         NSMutableArray *quotedParameters = [[NSMutableArray alloc]initWithCapacity:[aValue count]];
         value = [[NSMutableString alloc]initWithFormat:@"%@ IN (", NSFAttribute];
@@ -859,7 +851,7 @@ + (NSString *)_querySegmentForAttributeColumnWithValue:(id)anAttributeValue matc
         [segment appendString:value];
         
         // Free allocated resources
-    } else if ([aValue isKindOfClass:[NSNull class]]) {
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]) {
         NSString *NULLStringValue = NSFStringFromNanoDataType (NSFNanoTypeNULL);
         switch (match) {
             case NSFEqualTo:
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.h b/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.h
index 352eedc..b6bbd7d 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.h
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.h
@@ -92,7 +92,7 @@
  - PRAGMA temp_store = MEMORY;
  
  @note Set this property before you open the document store.
- @see - (BOOL)openWithError:(NSError * __autoreleasing *)outError;
+ @see - (BOOL)openWithError:(out NSError **)outError;
  */
 @property (nonatomic, assign, readwrite) NSFEngineProcessingMode nanoEngineProcessingMode;
 /** * Number of iterations that will trigger an automatic save. */
@@ -111,12 +111,12 @@
  * @return A document store upon success, nil otherwise.
  * @note
  * To manipulate the document store, you must first open it. If you don't need to configure settings for the document store, you can use
- * \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError \endlink instead.
+ * \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError \endlink instead.
  * @warning
  * The path is only meaningful for document stores of type \link NSFGlobals::NSFPersistentStoreType NSFPersistentStoreType \endlink. It must not be nil.
  * @throws NSFUnexpectedParameterException is thrown if the file path is nil or empty and the type is set to @ref NSFPersistentStoreType "NSFPersistentStoreType".
- * @see \link openWithError: - (BOOL)openWithError:(NSError * __autoreleasing *)outError \endlink
- * @see \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link openWithError: - (BOOL)openWithError:(out NSError **)outError \endlink
+ * @see \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError \endlink
  */
 
 + (NSFNanoStore *)createStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath;
@@ -131,11 +131,11 @@
  * @warning
  * The path is only meaningful for document stores of type @ref NSFPersistentStoreType "NSFPersistentStoreType". It must not be nil.
  * @throws NSFUnexpectedParameterException is thrown if the file path is nil or empty and the type is set to @ref NSFPersistentStoreType "NSFPersistentStoreType".
- * @see \link openWithError: - (BOOL)openWithError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link openWithError: - (BOOL)openWithError:(out NSError **)outError \endlink
  * @see \link createStoreWithType:path: + (NSFNanoStore *)createStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath \endlink
  */
 
-+ (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError;
++ (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError;
 
 /** * Initializes a newly allocated document store of a specific type at a given file path.
  * @param theType the type of document store that will be created.
@@ -143,12 +143,12 @@
  * @return A document store upon success, nil otherwise.
  * @note
  * To manipulate the document store, you must first open it. If you don't need to configure settings for the document store, you can use
- * \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError \endlink instead.
+ * \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError \endlink instead.
  * @warning
  * The path is only meaningful for document stores of type @ref NSFPersistentStoreType "NSFPersistentStoreType". It must not be nil.
  * @throws NSFUnexpectedParameterException is thrown if the file path is nil and the type is set to @ref NSFPersistentStoreType "NSFPersistentStoreType".
- * @see \link openWithError: - (BOOL)openWithError:(NSError * __autoreleasing *)outError \endlink
- * @see \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link openWithError: - (BOOL)openWithError:(out NSError **)outError \endlink
+ * @see \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError \endlink
  */
 
 - (id)initStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath;
@@ -169,14 +169,14 @@
  * @see \link createStoreWithType:path: + (NSFNanoStore *)createStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath \endlink
  */
 
-- (BOOL)openWithError:(NSError * __autoreleasing *)outError;
+- (BOOL)openWithError:(out NSError **)outError;
 
 /** * Closes the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @see \link isClosed - (BOOL)isClosed \endlink
  */
 
-- (BOOL)closeWithError:(NSError * __autoreleasing *)outError;
+- (BOOL)closeWithError:(out NSError **)outError;
 
 //@}
 
@@ -210,10 +210,10 @@
  * @return YES upon success, NO otherwise.
  * @warning This value cannot be nil and it must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
  * @throws NSFNonConformingNanoObjectProtocolException is thrown if the object is non-\link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink compliant.
- * @see \link addObjectsFromArray:error: - (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link addObjectsFromArray:error: - (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
  */
 
-- (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError;
+- (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError;
 
 /** * Adds a series of \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant objects to the document store.
  * @param theObjects is an array of objects to be added to the document store. The objects must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
@@ -221,58 +221,58 @@
  * @return YES upon success, NO otherwise.
  * @warning The objects of the array must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
  * @throws NSFNonConformingNanoObjectProtocolException is thrown if the object is non-\link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink compliant.
- * @see \link addObject:error: - (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link addObject:error: - (BOOL)addObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
  */
 
-- (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError;
+- (BOOL)addObjectsFromArray:(NSArray *)theObjects error:(out NSError **)outError;
 
 /** * Removes an object from the document store.
  * @param theObject the object to be removed from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @warning The objects of the array must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
- * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink
+ * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
+ * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError;
+- (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError;
 
 /** * Removes the list of objects with the specified keys from the document store.
  * @param theKeys the list of keys to be removed from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @warning The objects of the array must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
- * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
+ * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
+ * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError;
+- (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError;
 
 /** * Removes the list of objects from the document store.
  * @param theObjects the list of objects to be removed from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @warning The objects of the array must be \link NSFNanoObjectProtocol::initNanoObjectFromDictionaryRepresentation:forKey:store: NSFNanoObjectProtocol\endlink-compliant.
- * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
+ * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink
+ * @see \link removeAllObjectsFromStoreAndReturnError: - (BOOL)removeAllObjectsFromStoreAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError;
+- (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError;
 
 /** * Removes all objects from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
- * @note Please note that the unoccupied space will not be reclaimed, so after clearing the cache use \link compactStoreAndReturnError: - (BOOL)compactStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @note Please note that the unoccupied space will not be reclaimed, so after clearing the cache use \link compactStoreAndReturnError: - (BOOL)compactStoreAndReturnError:(out NSError **)outError \endlink
  * if you want to decrease the database file size.
- * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink
- * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
+ * @see \link removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
+ * @see \link removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink
+ * @see \link removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
  */
 
-- (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)removeAllObjectsFromStoreAndReturnError:(out NSError **)outError;
 
 //@}
 
@@ -376,14 +376,14 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note After storing several objects and depending on the save interval, some objects could be left in the cache in an unsaved state.
- * Therefore, it's always a good idea to call \link saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * Therefore, it's always a good idea to call \link saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(out NSError **)outError \endlink
  * @see \link discardUnsavedChanges - (void)discardUnsavedChanges \endlink
  */
 
-- (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)saveStoreAndReturnError:(out NSError **)outError;
 
 /** * Discards the uncommitted changes that were added to the document store.
- * @see \link saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(out NSError **)outError \endlink
  */
 
 - (void)discardUnsavedChanges;
@@ -393,25 +393,25 @@
  * @return YES upon success, NO otherwise.
  */
 
-- (BOOL)compactStoreAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)compactStoreAndReturnError:(out NSError **)outError;
 
 /** * Remove all indexes from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note Clearing the indexes could speed up document store manipulations (insertions, updates and deletions).
- * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)clearIndexesAndReturnError:(out NSError **)outError;
 
 /** * Recreate all indexes from the document store.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
- * @note Rebuilding the indexes recreates the indexes previously removed with \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink.
- * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @note Rebuilding the indexes recreates the indexes previously removed with \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(out NSError **)outError \endlink.
+ * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)rebuildIndexesAndReturnError:(out NSError **)outError;
 
 /** * Makes a copy of the document store to a different location and optionally compacts it to its minimum size.
  * @param thePath is the location where the document store should be copied to.
@@ -419,10 +419,10 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @note Works with both, file-based and memory-backed document stores.
- * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)saveStoreToDirectoryAtPath:(NSString *)thePath compactDatabase:(BOOL)shouldCompact error:(NSError * __autoreleasing *)outError;
+- (BOOL)saveStoreToDirectoryAtPath:(NSString *)thePath compactDatabase:(BOOL)shouldCompact error:(out NSError **)outError;
 
 //@}
 
@@ -435,34 +435,34 @@
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @attention Use this method instead of the ones provided by NSFNanoEngine.
- * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link commitTransactionAndReturnError: - (BOOL)commitTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link rollbackTransactionAndReturnError: - (BOOL)rollbackTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link clearIndexesAndReturnError: - (BOOL)clearIndexesAndReturnError:(out NSError **)outError \endlink
+ * @see \link commitTransactionAndReturnError: - (BOOL)commitTransactionAndReturnError:(out NSError **)outError \endlink
+ * @see \link rollbackTransactionAndReturnError: - (BOOL)rollbackTransactionAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)beginTransactionAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)beginTransactionAndReturnError:(out NSError **)outError;
 
 /** * Commit a transaction.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @attention Use this method instead of the ones provided by NSFNanoEngine.
- * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link beginTransactionAndReturnError: - (BOOL)beginTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link rollbackTransactionAndReturnError: - (BOOL)rollbackTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(out NSError **)outError \endlink
+ * @see \link beginTransactionAndReturnError: - (BOOL)beginTransactionAndReturnError:(out NSError **)outError \endlink
+ * @see \link rollbackTransactionAndReturnError: - (BOOL)rollbackTransactionAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)commitTransactionAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)commitTransactionAndReturnError:(out NSError **)outError;
 
 /** * Rollback a transaction.
  * @param outError is used if an error occurs. May be NULL.
  * @return YES upon success, NO otherwise.
  * @attention Use this method instead of the ones provided by NSFNanoEngine.
- * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link beginTransactionAndReturnError: - (BOOL)beginTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
- * @see \link commitTransactionAndReturnError: - (BOOL)commitTransactionAndReturnError:(NSError * __autoreleasing *)outError \endlink
+ * @see \link rebuildIndexesAndReturnError: - (BOOL)rebuildIndexesAndReturnError:(out NSError **)outError \endlink
+ * @see \link beginTransactionAndReturnError: - (BOOL)beginTransactionAndReturnError:(out NSError **)outError \endlink
+ * @see \link commitTransactionAndReturnError: - (BOOL)commitTransactionAndReturnError:(out NSError **)outError \endlink
  */
 
-- (BOOL)rollbackTransactionAndReturnError:(NSError * __autoreleasing *)outError;
+- (BOOL)rollbackTransactionAndReturnError:(out NSError **)outError;
 
 //@}
 
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m
index 3d62bed..259f85e 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m
@@ -62,7 +62,7 @@ + (NSFNanoStore *)createStoreWithType:(NSFNanoStoreType)theType path:(NSString *
     return [[self alloc]initStoreWithType:theType path:thePath];
 }
 
-+ (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError
++ (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError
 {
     NSFNanoStore *nanoStore = [[self alloc]initStoreWithType:theType path:thePath];
     [nanoStore openWithError:outError];
@@ -122,7 +122,7 @@ - (NSString *)filePath
     return [nanoStoreEngine path];
 }
 
-- (BOOL)openWithError:(NSError * __autoreleasing *)outError
+- (BOOL)openWithError:(out NSError **)outError
 {
     if ([nanoStoreEngine isDatabaseOpen] == YES)
         return YES;
@@ -161,7 +161,7 @@ - (BOOL)openWithError:(NSError * __autoreleasing *)outError
     return YES;
 }
 
-- (BOOL)closeWithError:(NSError * __autoreleasing *)outError
+- (BOOL)closeWithError:(out NSError **)outError
 {
     BOOL success = [self saveStoreAndReturnError:outError];
     [self _releasePreparedStatements];
@@ -209,14 +209,14 @@ - (BOOL)hasUnsavedChanges
 
 #pragma mark -
 
-- (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(NSError * __autoreleasing *)outError
+- (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(out NSError **)outError
 {
     NSArray *wrapper = [[NSArray alloc]initWithObjects:object, nil];
     BOOL success = [self addObjectsFromArray:wrapper error:outError];
     return success;
 }
 
-- (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(NSError * __autoreleasing *)outError
+- (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(out NSError **)outError
 {
     if (nil == someObjects) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
@@ -239,11 +239,11 @@ - (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(NSError * __autoreleas
     
     for (id object in someObjects) {
         // If it's a bag, make sure the name is unique
-        if ([object isKindOfClass:[NSFNanoBag class]]) {
+        if (YES == [object isKindOfClass:[NSFNanoBag class]]) {
             NSFNanoBag *bag = (NSFNanoBag *)object;
             
             // If it's a bag, process it first by gathering. If it's not dirty, there's no need to save...
-            if ([bag hasUnsavedChanges]) {
+            if (YES == [bag hasUnsavedChanges]) {
                 NSError *error = nil;
                 
                 // Associate the bag to this store
@@ -279,14 +279,14 @@ - (BOOL)addObjectsFromArray:(NSArray *)someObjects error:(NSError * __autoreleas
     return success;
 }
 
-- (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError
+- (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError
 {
     NSArray *wrapper = [[NSArray alloc]initWithObjects:theObject, nil];
     BOOL success = [self removeObjectsInArray:wrapper error:outError];
     return success;
 }
 
-- (BOOL)removeObjectsWithKeysInArray:(NSArray *)someKeys error:(NSError * __autoreleasing *)outError
+- (BOOL)removeObjectsWithKeysInArray:(NSArray *)someKeys error:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -359,7 +359,7 @@ - (BOOL)removeObjectsWithKeysInArray:(NSArray *)someKeys error:(NSError * __auto
     return YES;
 }
 
-- (BOOL)removeObjectsInArray:(NSArray *)someObjects error:(NSError * __autoreleasing *)outError
+- (BOOL)removeObjectsInArray:(NSArray *)someObjects error:(out NSError **)outError
 {
     NSMutableArray *someKeys = [NSMutableArray array];
     
@@ -460,7 +460,7 @@ - (NSArray *)allObjectClasses
 {
     NSFNanoResult *results = [self _executeSQL:@"SELECT DISTINCT(NSFObjectClass) FROM NSFKeys"];
     
-    return [results valuesForColumn:NSFObjectClass];
+    return [results valuesForColumn:@"NSFKeys.NSFObjectClass"];
 }
 
 - (NSArray *)objectsOfClassNamed:(NSString *)theClassName
@@ -507,7 +507,7 @@ - (long long)countOfObjectsOfClassNamed:(NSString *)theClassName
 #pragma mark Database Optimizations and Maintenance
 #pragma mark -
 
-- (BOOL)beginTransactionAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)beginTransactionAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -520,7 +520,7 @@ - (BOOL)beginTransactionAndReturnError:(NSError * __autoreleasing *)outError
     return [self _isOurTransaction];
 }
 
-- (BOOL)commitTransactionAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)commitTransactionAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -535,7 +535,7 @@ - (BOOL)commitTransactionAndReturnError:(NSError * __autoreleasing *)outError
     return NO;
 }
 
-- (BOOL)rollbackTransactionAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)rollbackTransactionAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -555,7 +555,7 @@ - (BOOL)rollbackTransactionAndReturnError:(NSError * __autoreleasing *)outError
 // Store/save unsaved objects
 // ----------------------------------------------
 
-- (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)saveStoreAndReturnError:(out NSError **)outError
 {
     // We are really not saving anything new, just indicating that we should commit the unsaved changes.
     if (NO == self.hasUnsavedChanges) {
@@ -574,7 +574,7 @@ - (void)discardUnsavedChanges
 // Clearing the store
 // ----------------------------------------------
 
-- (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)removeAllObjectsFromStoreAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -603,7 +603,7 @@ - (BOOL)removeAllObjectsFromStoreAndReturnError:(NSError * __autoreleasing *)out
 // Compacting the database
 // ----------------------------------------------
 
-- (BOOL)compactStoreAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)compactStoreAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -611,7 +611,7 @@ - (BOOL)compactStoreAndReturnError:(NSError * __autoreleasing *)outError
     return [[self nanoStoreEngine]compact];
 }
 
-- (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)clearIndexesAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -630,7 +630,7 @@ - (BOOL)clearIndexesAndReturnError:(NSError * __autoreleasing *)outError
     return YES;
 }
 
-- (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)rebuildIndexesAndReturnError:(out NSError **)outError
 {
     if ([self _checkNanoStoreIsReadyAndReturnError:outError] == NO)
         return NO;
@@ -655,7 +655,7 @@ - (BOOL)rebuildIndexesAndReturnError:(NSError * __autoreleasing *)outError
     return YES;
 }
 
-- (BOOL)saveStoreToDirectoryAtPath:(NSString *)path compactDatabase:(BOOL)compact error:(NSError * __autoreleasing *)outError
+- (BOOL)saveStoreToDirectoryAtPath:(NSString *)path compactDatabase:(BOOL)compact error:(out NSError **)outError
 {
     if (nil == path)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
@@ -714,7 +714,7 @@ - (NSFNanoResult *)_executeSQL:(NSString *)theSQLStatement
     return [[self nanoStoreEngine]executeSQL:theSQLStatement];
 }
 
-- (BOOL)_initializePreparedStatementsWithError:(NSError * __autoreleasing *)outError
+- (BOOL)_initializePreparedStatementsWithError:(out NSError **)outError
 {
     BOOL hasInitializationSucceeded = YES;
     
@@ -770,7 +770,7 @@ - (BOOL)_isOurTransaction
     return _isOurTransaction;
 }
 
-- (BOOL)_checkNanoStoreIsReadyAndReturnError:(NSError * __autoreleasing *)outError
+- (BOOL)_checkNanoStoreIsReadyAndReturnError:(out NSError **)outError
 {
     if (nil == [self nanoStoreEngine]) {
         if (nil != outError)
@@ -798,30 +798,43 @@ - (BOOL)_setupCachingSchema
     NSString *theSQLStatement;
     BOOL success;
     NSArray *tables = [[self nanoStoreEngine]tables];
+    NSString *rowUIDDatatype = NSFStringFromNanoDataType(NSFNanoTypeRowUID);
+    NSString *stringDatatype = NSFStringFromNanoDataType(NSFNanoTypeString);
+    NSString *dateDatatype = NSFStringFromNanoDataType(NSFNanoTypeDate);
 
     // Setup the Values table
     if ([tables containsObject:NSFValues] == NO) {
         theSQLStatement = [NSString stringWithFormat:@"CREATE TABLE %@(ROWID INTEGER PRIMARY KEY, %@ TEXT, %@ TEXT, %@ NONE, %@ TEXT);", NSFValues, NSFKey, NSFAttribute, NSFValue, NSFDatatype];
         success = (nil == [[[self nanoStoreEngine]executeSQL:theSQLStatement]error]);
-        if (NO == success) {
+        if (NO == success)
             return NO;
-        }
-}
+        
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFValues, NSFRowIDColumnName, rowUIDDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFValues, NSFKey, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFValues, NSFAttribute, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFValues, NSFValue, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFValues, NSFDatatype, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+    }
     
     // Setup the Plist table
     if ([tables containsObject:NSFKeys] == NO) {
         theSQLStatement = [NSString stringWithFormat:@"CREATE TABLE %@(ROWID INTEGER PRIMARY KEY, %@ TEXT, %@ BLOB, %@ TEXT, %@ TEXT);", NSFKeys, NSFKey, NSFKeyedArchive, NSFCalendarDate, NSFObjectClass];
 
         success = (nil == [[[self nanoStoreEngine]executeSQL:theSQLStatement]error]);
-        if (NO == success) {
+        if (NO == success)
             return NO;
-        }
-}
+        
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFKeys, NSFRowIDColumnName, rowUIDDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFKeys, NSFKey, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFKeys, NSFKeyedArchive, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFKeys, dateDatatype, dateDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];        
+        [[self nanoStoreEngine]NSFP_insertStringValues:[NSArray arrayWithObjects:NSFKeys, NSFObjectClass, stringDatatype, nil] forColumns:[NSArray arrayWithObjects:NSFP_TableIdentifier, NSFP_ColumnIdentifier, NSFP_DatatypeIdentifier, nil]table:NSFP_SchemaTable];
+    }
     
     return YES;
 }
 
-- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(NSError * __autoreleasing *)outError
+- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(out NSError **)outError
 {
     if (nil == someInfo)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
@@ -931,7 +944,7 @@ - (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forCla
         }
     }
     
-    if (success) {
+    if (YES == success) {
         NSData *dictBinData = [NSKeyedArchiver archivedDataWithRootObject:someInfo];
         {
             int status = sqlite3_reset (_storeKeysStatement);
@@ -1104,7 +1117,7 @@ - (void)_executeSQLite3StepUsingSQLite3Statement:(sqlite3_stmt *)aStatement
     } while (waitingForRow);
 }
 
-- (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave error:(NSError * __autoreleasing *)outError
+- (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave error:(out NSError **)outError
 {
     // Collect the objects
     [_addedObjects addObjectsFromArray:someObjects];
@@ -1115,7 +1128,7 @@ - (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave er
         return YES;
     }
     
-    if (forceSave || (0 == unsavedObjectsCount % saveInterval)) {
+    if ((YES == forceSave) || (0 == unsavedObjectsCount % saveInterval)) {
         NSDate *startStoringDate = [NSDate date];
         
         NSDate *startRemovingDate = [NSDate date];
@@ -1172,7 +1185,7 @@ - (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave er
             @autoreleasepool {
                 // If the object was originally created by storing a class not recognized by this process, honor it and store it with the right class string.
                 NSString *className = nil;
-                if ([object respondsToSelector:@selector(originalClassString)]) {
+                if (YES == [object respondsToSelector:@selector(originalClassString)]) {
                     className = [object originalClassString];
                 }
                 
@@ -1188,7 +1201,7 @@ - (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave er
                                            userInfo:nil]raise];
                 } else {
                     SEL setStoreSelector = @selector(setStore:);
-                    if ([object respondsToSelector:setStoreSelector]) {
+                    if (YES == [object respondsToSelector:setStoreSelector]) {
                         #pragma clang diagnostic push
                         #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
                         [object performSelector:setStoreSelector withObject:self];
@@ -1207,7 +1220,7 @@ - (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave er
                                                userInfo:nil]raise];
                     }
                     
-                    if (transactionStartedHere) {
+                    if (YES == transactionStartedHere) {
                         transactionStartedHere = [self beginTransactionAndReturnError:outError];
                         if (NO == transactionStartedHere) {
                             if (nil != outError) errorMessage = [*outError localizedDescription];
@@ -1269,14 +1282,14 @@ + (NSDictionary *)_defaultTestData
 // Backup the store to a specific location
 // ----------------------------------------------
 
-- (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSString *)anExtension compact:(BOOL)flag error:(NSError * __autoreleasing *)outError
+- (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSString *)anExtension compact:(BOOL)flag error:(out NSError **)outError
 {
     NSString *filePath = [self filePath];
     if ((anExtension != nil) && (NO == [backupPath hasSuffix:anExtension]))
         backupPath = [NSString stringWithFormat:@"%@.%@", backupPath, anExtension];
     
     // Make sure we the destination path is not the same as the source!
-    if ([filePath isEqualToString:backupPath]) {
+    if (YES == [filePath isEqualToString:backupPath]) {
         if (nil != outError)
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
@@ -1288,7 +1301,7 @@ - (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSSt
     NSFileManager *fm = [NSFileManager defaultManager];
     BOOL destinationLocationIsClear = YES;
     
-    if ([fm fileExistsAtPath:backupPath]) {
+    if (YES == [fm fileExistsAtPath:backupPath]) {
         destinationLocationIsClear = [fm removeItemAtPath:backupPath error:nil];
         if (NO == destinationLocationIsClear) {
             if (nil != outError)
@@ -1319,7 +1332,7 @@ - (BOOL)_backupFileStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSSt
     return YES;
 }
 
-- (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSString *)anExtension compact:(BOOL)flag error:(NSError * __autoreleasing *)outError
+- (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)backupPath extension:(NSString *)anExtension compact:(BOOL)flag error:(out NSError **)outError
 {
     NSString *filePath = [self filePath];
     if ((anExtension != nil) && (NO == [backupPath hasSuffix:anExtension])) {
@@ -1327,7 +1340,7 @@ - (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)backupPath extension:(NS
     }
     
     // Make sure we the destination path is not the same as the source!
-    if ([filePath isEqualToString:backupPath]) {
+    if (YES == [filePath isEqualToString:backupPath]) {
         if (nil != outError)
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
@@ -1344,7 +1357,7 @@ - (BOOL)_backupMemoryStoreToDirectoryAtPath:(NSString *)backupPath extension:(NS
     NSFileManager *fm = [NSFileManager defaultManager];
     BOOL destinationLocationIsClear = YES;
     
-    if ([fm fileExistsAtPath:backupPath]) {
+    if (YES == [fm fileExistsAtPath:backupPath]) {
         destinationLocationIsClear = [fm removeItemAtPath:backupPath error:nil];
         if (NO == destinationLocationIsClear) {
             if (nil != outError)
diff --git a/vendor/Pods/NanoStore/Classes/Public/NanoStore.h b/vendor/Pods/NanoStore/Classes/Public/NanoStore.h
index def6668..214b5b5 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NanoStore.h
+++ b/vendor/Pods/NanoStore/Classes/Public/NanoStore.h
@@ -164,7 +164,7 @@
  Until the limit set by NSFNanoEngine's \link NSFNanoEngine::cacheSize - (NSUInteger)cacheSize \endlink has been reached, memory usage would be the same for in-memory store and on-disk store. When the size
  of the store grows beyond \link NSFNanoEngine::cacheSize - (NSUInteger)cacheSize \endlink in-memory stores start to consume more memory than on-disk ones, because it has nowhere to push pages out of the cache.
  
- Typically, most developers may want to create and open the document store. To do that, use NSFNanoStore's \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(NSError * __autoreleasing *)outError \endlink method.
+ Typically, most developers may want to create and open the document store. To do that, use NSFNanoStore's \link createAndOpenStoreWithType:path:error: + (NSFNanoStore *)createAndOpenStoreWithType:(NSFNanoStoreType)theType path:(NSString *)thePath error:(out NSError **)outError \endlink method.
  
  @details <b>Example:</b>
  @code
@@ -266,9 +266,9 @@
  
  To remove an object, there are several options available. The most common methods are found in NSFNanoStore:
  
- - \link NSFNanoStore::removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(NSError * __autoreleasing *)outError \endlink
- - \link NSFNanoStore::removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink
- - \link NSFNanoStore::removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(NSError * __autoreleasing *)outError \endlink
+ - \link NSFNanoStore::removeObject:error: - (BOOL)removeObject:(id <NSFNanoObjectProtocol>)theObject error:(out NSError **)outError \endlink
+ - \link NSFNanoStore::removeObjectsWithKeysInArray:error: - (BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink
+ - \link NSFNanoStore::removeObjectsInArray:error: - (BOOL)removeObjectsInArray:(NSArray *)theObjects error:(out NSError **)outError \endlink
 
  @details <b>Example:</b>
  @code
@@ -318,7 +318,7 @@
  - 3) Obtain the results specifying whether objects or keys should be returned (*)
  
  (*) If introspecting the data is needed, request objects. You should request keys if you need to feed the result to another method, such as NSFNanoStore
- \link NSFNanoStore::removeObjectsWithKeysInArray:error: -(BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(NSError * __autoreleasing *)outError \endlink method.
+ \link NSFNanoStore::removeObjectsWithKeysInArray:error: -(BOOL)removeObjectsWithKeysInArray:(NSArray *)theKeys error:(out NSError **)outError \endlink method.
  
  @details <b>Example: finding all objects with the attribute 'LastName' and value 'Doe'.</b>
  @code
@@ -345,7 +345,7 @@
  
  // Remove the NanoObjects matching the selected UUIDs
  NSError *outError = nil;
- if ([nanoStore removeObjectsWithKeysInArray:matchingKeys error:&outError]) {
+ if (YES == [nanoStore removeObjectsWithKeysInArray:matchingKeys error:&outError]) {
     NSLog(@"The matching objects have been removed.");
  } else {
     NSLog(@"An error has occurred while removing the matching objects. Reason: %@", [outError localizedDescription]);
@@ -477,7 +477,7 @@
  [nanoStore saveStoreAndReturnError:nil];
  @endcode
  
- @note If you set the saveInterval value to anything other one, keep in mind that some objects may still be left unsaved after being added or modified. To make sure they're saved properly, call \link NSFNanoStore::saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(NSError * __autoreleasing *)outError \endlink.
+ @note If you set the saveInterval value to anything other one, keep in mind that some objects may still be left unsaved after being added or modified. To make sure they're saved properly, call \link NSFNanoStore::saveStoreAndReturnError: - (BOOL)saveStoreAndReturnError:(out NSError **)outError \endlink.
  
  Choosing a good saveInterval value is more art than science. While testing NanoStore using a medium-sized dictionary (iTunes' MP3 dictionary) setting saveInterval to 1000 resulted in the best performance. You may want to test with different numbers and fine-tune it for your data set.
  
diff --git a/vendor/Pods/NanoStore/README.md b/vendor/Pods/NanoStore/README.md
index 5290db5..bf1cc19 100644
--- a/vendor/Pods/NanoStore/README.md
+++ b/vendor/Pods/NanoStore/README.md
@@ -19,7 +19,7 @@ Relational databases tend to have a rich understanding of the structure of your
 * Full index support, inner-objects, embedded arrays and dictionaries
 * Convenience methods to access, manipulate and maintain SQLite databases
 * Full SQLite access available
-* Mac OS X Mountain Lion 10.8 and iOS 6 ready
+* Mac OS X Lion 10.7 and iOS 5 ready
 * iOS library runs on the device and simulator
 * ARC compliant
 
diff --git a/vendor/Pods/Pods.xcodeproj/project.pbxproj b/vendor/Pods/Pods.xcodeproj/project.pbxproj
index 7a57df3..dd98a34 100644
--- a/vendor/Pods/Pods.xcodeproj/project.pbxproj
+++ b/vendor/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,307 +7,307 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0C274E59860EF307B4C545B2 /* NSFNanoSearch_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EFE8BFC3F654C4E4E1E67F5 /* NSFNanoSearch_Private.h */; };
-		1A4743DEBB1E4D1339B58C68 /* NSFNanoStore_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 78EB5E9A8CBE3487843D7772 /* NSFNanoStore_Private.h */; };
-		237AF629503884E8DD95DBC4 /* NSFNanoExpression_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 43E0B2133B3DB2A71CF3B2CF /* NSFNanoExpression_Private.h */; };
-		26A84372711B656B2764A741 /* NSFNanoExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A2A6C0B4A0B309593279FC9 /* NSFNanoExpression.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		2BC73D9E3F44B58D28BC6CFB /* NSFNanoBag_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E8F7760718418E9897989C3 /* NSFNanoBag_Private.h */; };
-		2D3C116C6A1B5181F75513D9 /* Pods-NanoStore-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F05DF3B583185A3F95B5AB4C /* Pods-NanoStore-dummy.m */; };
-		3052CFA77945A93D56F8D408 /* NSFOrderedDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = E2E1CE880FE4AB0219EC2D88 /* NSFOrderedDictionary.h */; };
-		38274177FBDFB7175BBBAE82 /* NanoStore_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = EC7F8F45C30C598E45CD442D /* NanoStore_Private.h */; };
-		4440520584C588A3149ED091 /* NSFNanoPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C1ACF0F6BF09985944E26F0 /* NSFNanoPredicate.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		4BB353BA07AE2FBE785DAD7D /* NSFNanoObjectProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = BFE02B2E90E37C6E748AA29F /* NSFNanoObjectProtocol.h */; };
-		532A43ED76045EFC3E398C5F /* NSFNanoEngine_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D40C0EEF73F1A65D89025926 /* NSFNanoEngine_Private.h */; };
-		588F0C072793D614F26F2EA6 /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D6AF36BA6642490C96460859 /* Pods-dummy.m */; };
-		5B3754C5744F9BEAA12BCD85 /* NSFNanoResult_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 762863DE5511E098539A5267 /* NSFNanoResult_Private.h */; };
-		5DFCE4227537BB4FCCE57990 /* NSFNanoEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 1910E349C8ED9F1F5B9AE117 /* NSFNanoEngine.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		60DCF13E62EB12533B6E5B54 /* NSFNanoBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 06E7607A831083C1FF8B3D68 /* NSFNanoBag.h */; };
-		6E218B553A7ECE3C5E3EC91D /* NSFNanoStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42EDD7AE123E71A777AEA0 /* NSFNanoStore.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		71037418E0FEE4C07D0A5074 /* NSFNanoObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BA2F869EA5CFBFFD8E774C /* NSFNanoObject.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		72D15E52663D627AD4069645 /* NSFOrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 190BB20241CCA6547CA81D9B /* NSFOrderedDictionary.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		7B6E0967BAD0B5567B602366 /* NSFNanoResult.h in Headers */ = {isa = PBXBuildFile; fileRef = C2E4FD0DCC091D96B24B60D3 /* NSFNanoResult.h */; };
-		8117A26135FB6D43E233E4FC /* NSFNanoGlobals.m in Sources */ = {isa = PBXBuildFile; fileRef = E0A7B55C127D737CD0760387 /* NSFNanoGlobals.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		894891CE6C0A812E4039C347 /* NSFNanoBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A70780C76FA894DC1EF4B5 /* NSFNanoBag.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		8AB2CF4EA990DCE80A70E47C /* NSFNanoObject_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 197BFB28D85AD495A7032FC1 /* NSFNanoObject_Private.h */; };
-		9BD5D2D24A598BA606CB1A29 /* NSFNanoPredicate.h in Headers */ = {isa = PBXBuildFile; fileRef = 03F1C36DF2F1865C919DE4B2 /* NSFNanoPredicate.h */; };
-		A0428C456BC7069CFCBBFE4A /* NSFNanoSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 7088B28741581D50D050F4D7 /* NSFNanoSearch.h */; };
-		A63D1A9C13E336E79B329DB3 /* NSFNanoObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A0E4309AEA0DA6336AD2980 /* NSFNanoObject.h */; };
-		ABEBD0273E86B7CACD42279C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7465D778E1F78D475A10C8FD /* Foundation.framework */; };
-		C2EF69BEC11ABA58ABE207BA /* NSFNanoResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DD39F99C067F086130E3C99 /* NSFNanoResult.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		C6B067EEEE561A9A9ACD0BEE /* NSFNanoGlobals_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FD35C61631EABDAA59318CDF /* NSFNanoGlobals_Private.h */; };
-		CA1465ED1DDEB15B0D2266D1 /* NanoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DE8095783DA8B129FFF76FC /* NanoStore.h */; };
-		CBD59AA2756F2B926EDBA137 /* NSFNanoEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 75DB5C35A88A72EA2A70372E /* NSFNanoEngine.h */; };
-		DB142A06A41A607E8D6DF1AE /* NSFNanoSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = EBD00A8F308D14816BDA785E /* NSFNanoSearch.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		DE8E00A9DB9989CD48B46B2A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7465D778E1F78D475A10C8FD /* Foundation.framework */; };
-		E5DDBDFD4D7AEB8F16F91573 /* NSFNanoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F74589A60C2A6209078143B /* NSFNanoStore.h */; };
-		EC7DF7C43DC95DC93B43087B /* NSFNanoSortDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = F6EB3191F034A80AE56075D5 /* NSFNanoSortDescriptor.h */; };
-		ECF2A333FDC2FA2B9AB118DC /* NSFNanoExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 921AAE497F5E54BCF57E3BEB /* NSFNanoExpression.h */; };
-		F6E9145184BC284BC23E55BE /* NSFNanoPredicate_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F660E1CD36227D963CC16D7 /* NSFNanoPredicate_Private.h */; };
-		FAECCD1493C750D8EA34A6BD /* NSFNanoSortDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 46E0398C5190975250E9F637 /* NSFNanoSortDescriptor.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		FCAD0EA82541ADD8452EAAC5 /* NSFNanoGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E41A4D5A348A84AAA15829 /* NSFNanoGlobals.h */; };
+		054F15F14A5E6A711F701572 /* NSFNanoObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F21684A0E963A7E1C848062A /* NSFNanoObject.h */; };
+		0781A101A0AD35A4768657DF /* NSFNanoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 06FFCA40286DE33B4B3053F5 /* NSFNanoStore.h */; };
+		12B60BDCDD7FF66828FE7A3E /* NSFNanoResult.m in Sources */ = {isa = PBXBuildFile; fileRef = FBAD5212398B09A67959A99F /* NSFNanoResult.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		2B8A2732F69803E995ECDCCD /* NSFNanoObjectProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = ECDF7035BA907D2D7A4F62F7 /* NSFNanoObjectProtocol.h */; };
+		2FE896BC5A8EE3D7AF75A409 /* NSFNanoEngine_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 48767C877FE4A5AA540E5058 /* NSFNanoEngine_Private.h */; };
+		36170BB70EFAE3F13D81DC83 /* NSFNanoEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 991E956D7161627F69887E04 /* NSFNanoEngine.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		3DC531F2DD982EB8AFB66E22 /* NSFNanoPredicate_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 642D7718E71A7FA83481C316 /* NSFNanoPredicate_Private.h */; };
+		41764CF3244E5A0714FD3A9A /* NSFNanoSortDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = DC458D694A8B296DB5678D38 /* NSFNanoSortDescriptor.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		41F0B54E41DDE6451B72DA5F /* NSFNanoStore_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 06F2A1BB62353590ACC4AF10 /* NSFNanoStore_Private.h */; };
+		4E8A7C2C649660D715718352 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC468142F9BFADBD17605B35 /* Foundation.framework */; };
+		59B3B61570AD9FE0D676AB7D /* NSFNanoBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E19468CE618FD2075B7DEA /* NSFNanoBag.h */; };
+		6602FCCCC566353EA22CBCE3 /* NSFNanoPredicate.h in Headers */ = {isa = PBXBuildFile; fileRef = EE95DFE15BCF1C6098B0D4D5 /* NSFNanoPredicate.h */; };
+		6DC8A758421253FD7EAF0C96 /* NSFNanoStore.m in Sources */ = {isa = PBXBuildFile; fileRef = CF1FE1F6DC6EB3C4115A55F2 /* NSFNanoStore.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		704D3BDA0BBB80E03738FD12 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC468142F9BFADBD17605B35 /* Foundation.framework */; };
+		7837BE6A4D41A7716B6D6372 /* NanoStore_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 490EB159BE877DDCBFA8B1CE /* NanoStore_Private.h */; };
+		7B5E94D95F8F63F9AB40AFED /* NSFNanoExpression_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = C57EEC98774BC387C83F25AD /* NSFNanoExpression_Private.h */; };
+		82C3D936F0E6D86A59E6F067 /* NSFNanoResult.h in Headers */ = {isa = PBXBuildFile; fileRef = A102DD2AD7A5A3EBF51CBCAE /* NSFNanoResult.h */; };
+		85987A4AA94540E1AD75C764 /* NSFOrderedDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 34865615AF22A22A2F386356 /* NSFOrderedDictionary.h */; };
+		8EA2D966E5843705E6297004 /* NSFNanoPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2635F5E907521CC42CE46D22 /* NSFNanoPredicate.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		950DDB12D4A6E89150AC1A55 /* NSFNanoBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D06AA7E4FC520D28769DD4 /* NSFNanoBag.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		9588A43FFE299CB91F4230CF /* NSFNanoSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8A53A7B2579BAE4C855427 /* NSFNanoSearch.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		9AC2847D5A3DE39355F26EB6 /* NSFNanoSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 45CFB257557739BE1FA21045 /* NSFNanoSearch.h */; };
+		9AFE5B836A98A81FF480701C /* NSFNanoExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA75AC7E53D7E90DB19810D /* NSFNanoExpression.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		9E8D6F3616E48F7D09F6028E /* NSFNanoSearch_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 435D0D8D4C9783CBA37C75FA /* NSFNanoSearch_Private.h */; };
+		9FD7420320D2CD3E171BA2ED /* NSFNanoGlobals.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F86A38D7BB4DC49E7DCAB7C /* NSFNanoGlobals.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		A386C819FACB3F9472507C5E /* NSFNanoSortDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = C512561C56DB62D1425A07A6 /* NSFNanoSortDescriptor.h */; };
+		BF208A8AA89F04840AE410F8 /* NSFOrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E13C4882FB9CBA1CA839501 /* NSFOrderedDictionary.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		C6E4E129EF4BE4295590B4AE /* NSFNanoObject_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E3EEFBF1766F4707EF812C2 /* NSFNanoObject_Private.h */; };
+		D2255DEA2B31B0E17E25192C /* Pods-NanoStore-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3455AA7778BCC0616C0FAD48 /* Pods-NanoStore-dummy.m */; };
+		D355E2A29B0393742998A015 /* NanoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = C3DC221DC072819D1693E07D /* NanoStore.h */; };
+		D8AED02B9C48998E812C2B13 /* NSFNanoEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = BB920B2C5BAEF6CE2CE52A5B /* NSFNanoEngine.h */; };
+		DCA205CCA706801D30B3A0A4 /* NSFNanoGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 40745197CF4B9A21D3A118F7 /* NSFNanoGlobals.h */; };
+		E4AAE55EDCF92607AB9E4E4A /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D3C4D5E4FBE0298A5755EC /* Pods-dummy.m */; };
+		EBE419B239A8513259CE2DED /* NSFNanoObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 37CDEC529D55F78F752E5B41 /* NSFNanoObject.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		F838A0B0FEA27373C1F390DD /* NSFNanoGlobals_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 05967D4EF1E1A32CDF3E18FD /* NSFNanoGlobals_Private.h */; };
+		FBD11389E6CE4E983FB96575 /* NSFNanoBag_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 310C0E7ABC2108C2EE8AC48F /* NSFNanoBag_Private.h */; };
+		FC99839D6F7A583D33E9B65A /* NSFNanoResult_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = AB77973B618A3D107FA0D4AE /* NSFNanoResult_Private.h */; };
+		FE00CB794A29A0D0429B0563 /* NSFNanoExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 86FAA2942E5B5E64C24EADED /* NSFNanoExpression.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B3DCA5B90D053CAE1810C9B6 /* PBXContainerItemProxy */ = {
+		E8E9BD7C1B75990E9F31FCA3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 8173DE0D7D1355486E3123EC /* Project object */;
+			containerPortal = 0F5268D17D10826FCA675BCD /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9AF252C6D26A6762EEA62382;
+			remoteGlobalIDString = 49310D41BC31A00B3C60D173;
 			remoteInfo = "Pods-NanoStore";
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		01A70780C76FA894DC1EF4B5 /* NSFNanoBag.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoBag.m; path = Classes/Public/NSFNanoBag.m; sourceTree = "<group>"; };
-		03F1C36DF2F1865C919DE4B2 /* NSFNanoPredicate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoPredicate.h; path = Classes/Public/NSFNanoPredicate.h; sourceTree = "<group>"; };
-		06E7607A831083C1FF8B3D68 /* NSFNanoBag.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoBag.h; path = Classes/Public/NSFNanoBag.h; sourceTree = "<group>"; };
-		09AEE6C7BCF6D06E9B52CACF /* Pods-NanoStore.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NanoStore.xcconfig"; sourceTree = "<group>"; };
-		0BBBD34F0B1A9F1A06D87374 /* libPods-NanoStore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NanoStore.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		190BB20241CCA6547CA81D9B /* NSFOrderedDictionary.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFOrderedDictionary.m; path = Classes/Advanced/NSFOrderedDictionary.m; sourceTree = "<group>"; };
-		1910E349C8ED9F1F5B9AE117 /* NSFNanoEngine.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoEngine.m; path = Classes/Advanced/NSFNanoEngine.m; sourceTree = "<group>"; };
-		197BFB28D85AD495A7032FC1 /* NSFNanoObject_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObject_Private.h; path = Classes/Private/NSFNanoObject_Private.h; sourceTree = "<group>"; };
-		2F55E77821B892EAB270F02A /* Pods-NanoStore-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-NanoStore-prefix.pch"; sourceTree = "<group>"; };
-		43E0B2133B3DB2A71CF3B2CF /* NSFNanoExpression_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoExpression_Private.h; path = Classes/Private/NSFNanoExpression_Private.h; sourceTree = "<group>"; };
-		46E0398C5190975250E9F637 /* NSFNanoSortDescriptor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoSortDescriptor.m; path = Classes/Public/NSFNanoSortDescriptor.m; sourceTree = "<group>"; };
-		4F74589A60C2A6209078143B /* NSFNanoStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoStore.h; path = Classes/Public/NSFNanoStore.h; sourceTree = "<group>"; };
-		5DE8095783DA8B129FFF76FC /* NanoStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NanoStore.h; path = Classes/Public/NanoStore.h; sourceTree = "<group>"; };
-		5EFE8BFC3F654C4E4E1E67F5 /* NSFNanoSearch_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSearch_Private.h; path = Classes/Private/NSFNanoSearch_Private.h; sourceTree = "<group>"; };
-		5FF0E088F277F5B0FC6A332E /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		6A0E4309AEA0DA6336AD2980 /* NSFNanoObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObject.h; path = Classes/Public/NSFNanoObject.h; sourceTree = "<group>"; };
-		6F660E1CD36227D963CC16D7 /* NSFNanoPredicate_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoPredicate_Private.h; path = Classes/Private/NSFNanoPredicate_Private.h; sourceTree = "<group>"; };
-		7088B28741581D50D050F4D7 /* NSFNanoSearch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSearch.h; path = Classes/Public/NSFNanoSearch.h; sourceTree = "<group>"; };
-		71E41A4D5A348A84AAA15829 /* NSFNanoGlobals.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoGlobals.h; path = Classes/Public/NSFNanoGlobals.h; sourceTree = "<group>"; };
-		7465D778E1F78D475A10C8FD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		75DB5C35A88A72EA2A70372E /* NSFNanoEngine.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoEngine.h; path = Classes/Advanced/NSFNanoEngine.h; sourceTree = "<group>"; };
-		762863DE5511E098539A5267 /* NSFNanoResult_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoResult_Private.h; path = Classes/Private/NSFNanoResult_Private.h; sourceTree = "<group>"; };
-		78EB5E9A8CBE3487843D7772 /* NSFNanoStore_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoStore_Private.h; path = Classes/Private/NSFNanoStore_Private.h; sourceTree = "<group>"; };
-		7A2A6C0B4A0B309593279FC9 /* NSFNanoExpression.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoExpression.m; path = Classes/Public/NSFNanoExpression.m; sourceTree = "<group>"; };
-		7DD39F99C067F086130E3C99 /* NSFNanoResult.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoResult.m; path = Classes/Advanced/NSFNanoResult.m; sourceTree = "<group>"; };
-		8806D3A3C939F59B5FE0281D /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
-		8B08771182EF53394F8CDE6B /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
-		8C1ACF0F6BF09985944E26F0 /* NSFNanoPredicate.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoPredicate.m; path = Classes/Public/NSFNanoPredicate.m; sourceTree = "<group>"; };
-		8E8F7760718418E9897989C3 /* NSFNanoBag_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoBag_Private.h; path = Classes/Private/NSFNanoBag_Private.h; sourceTree = "<group>"; };
-		8F42EDD7AE123E71A777AEA0 /* NSFNanoStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoStore.m; path = Classes/Public/NSFNanoStore.m; sourceTree = "<group>"; };
-		921AAE497F5E54BCF57E3BEB /* NSFNanoExpression.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoExpression.h; path = Classes/Public/NSFNanoExpression.h; sourceTree = "<group>"; };
-		94BA2F869EA5CFBFFD8E774C /* NSFNanoObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoObject.m; path = Classes/Public/NSFNanoObject.m; sourceTree = "<group>"; };
-		9517DE9D01DAE833246D1B4A /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
-		B5CD55A04C145FEE704E2A5C /* Pods-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-environment.h"; sourceTree = "<group>"; };
-		BB63A9724E66F946ADFAFBAE /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
-		BFE02B2E90E37C6E748AA29F /* NSFNanoObjectProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObjectProtocol.h; path = Classes/Public/NSFNanoObjectProtocol.h; sourceTree = "<group>"; };
-		C2E4FD0DCC091D96B24B60D3 /* NSFNanoResult.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoResult.h; path = Classes/Advanced/NSFNanoResult.h; sourceTree = "<group>"; };
-		CA1930D27C27AFF49123C5F7 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
-		D40C0EEF73F1A65D89025926 /* NSFNanoEngine_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoEngine_Private.h; path = Classes/Private/NSFNanoEngine_Private.h; sourceTree = "<group>"; };
-		D6AF36BA6642490C96460859 /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = "<group>"; };
-		E0696D7B93267FECAC094576 /* Pods-NanoStore-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NanoStore-Private.xcconfig"; sourceTree = "<group>"; };
-		E0A7B55C127D737CD0760387 /* NSFNanoGlobals.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoGlobals.m; path = Classes/Public/NSFNanoGlobals.m; sourceTree = "<group>"; };
-		E2E1CE880FE4AB0219EC2D88 /* NSFOrderedDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFOrderedDictionary.h; path = Classes/Advanced/NSFOrderedDictionary.h; sourceTree = "<group>"; };
-		EBD00A8F308D14816BDA785E /* NSFNanoSearch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoSearch.m; path = Classes/Public/NSFNanoSearch.m; sourceTree = "<group>"; };
-		EC7F8F45C30C598E45CD442D /* NanoStore_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NanoStore_Private.h; path = Classes/Private/NanoStore_Private.h; sourceTree = "<group>"; };
-		F05DF3B583185A3F95B5AB4C /* Pods-NanoStore-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-NanoStore-dummy.m"; sourceTree = "<group>"; };
-		F6EB3191F034A80AE56075D5 /* NSFNanoSortDescriptor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSortDescriptor.h; path = Classes/Public/NSFNanoSortDescriptor.h; sourceTree = "<group>"; };
-		FD35C61631EABDAA59318CDF /* NSFNanoGlobals_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoGlobals_Private.h; path = Classes/Private/NSFNanoGlobals_Private.h; sourceTree = "<group>"; };
+		05967D4EF1E1A32CDF3E18FD /* NSFNanoGlobals_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoGlobals_Private.h; path = Classes/Private/NSFNanoGlobals_Private.h; sourceTree = "<group>"; };
+		06F2A1BB62353590ACC4AF10 /* NSFNanoStore_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoStore_Private.h; path = Classes/Private/NSFNanoStore_Private.h; sourceTree = "<group>"; };
+		06FFCA40286DE33B4B3053F5 /* NSFNanoStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoStore.h; path = Classes/Public/NSFNanoStore.h; sourceTree = "<group>"; };
+		0F86A38D7BB4DC49E7DCAB7C /* NSFNanoGlobals.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoGlobals.m; path = Classes/Public/NSFNanoGlobals.m; sourceTree = "<group>"; };
+		150A3579A9694BB6460CA0AD /* libPods-NanoStore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NanoStore.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		19D06AA7E4FC520D28769DD4 /* NSFNanoBag.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoBag.m; path = Classes/Public/NSFNanoBag.m; sourceTree = "<group>"; };
+		2635F5E907521CC42CE46D22 /* NSFNanoPredicate.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoPredicate.m; path = Classes/Public/NSFNanoPredicate.m; sourceTree = "<group>"; };
+		26E19468CE618FD2075B7DEA /* NSFNanoBag.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoBag.h; path = Classes/Public/NSFNanoBag.h; sourceTree = "<group>"; };
+		2E3EEFBF1766F4707EF812C2 /* NSFNanoObject_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObject_Private.h; path = Classes/Private/NSFNanoObject_Private.h; sourceTree = "<group>"; };
+		310C0E7ABC2108C2EE8AC48F /* NSFNanoBag_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoBag_Private.h; path = Classes/Private/NSFNanoBag_Private.h; sourceTree = "<group>"; };
+		3455AA7778BCC0616C0FAD48 /* Pods-NanoStore-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-NanoStore-dummy.m"; sourceTree = "<group>"; };
+		34865615AF22A22A2F386356 /* NSFOrderedDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFOrderedDictionary.h; path = Classes/Advanced/NSFOrderedDictionary.h; sourceTree = "<group>"; };
+		36D9D64CD9FB536058F9D245 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		37CDEC529D55F78F752E5B41 /* NSFNanoObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoObject.m; path = Classes/Public/NSFNanoObject.m; sourceTree = "<group>"; };
+		40745197CF4B9A21D3A118F7 /* NSFNanoGlobals.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoGlobals.h; path = Classes/Public/NSFNanoGlobals.h; sourceTree = "<group>"; };
+		435D0D8D4C9783CBA37C75FA /* NSFNanoSearch_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSearch_Private.h; path = Classes/Private/NSFNanoSearch_Private.h; sourceTree = "<group>"; };
+		45CFB257557739BE1FA21045 /* NSFNanoSearch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSearch.h; path = Classes/Public/NSFNanoSearch.h; sourceTree = "<group>"; };
+		48767C877FE4A5AA540E5058 /* NSFNanoEngine_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoEngine_Private.h; path = Classes/Private/NSFNanoEngine_Private.h; sourceTree = "<group>"; };
+		490EB159BE877DDCBFA8B1CE /* NanoStore_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NanoStore_Private.h; path = Classes/Private/NanoStore_Private.h; sourceTree = "<group>"; };
+		4EA75AC7E53D7E90DB19810D /* NSFNanoExpression.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoExpression.m; path = Classes/Public/NSFNanoExpression.m; sourceTree = "<group>"; };
+		5898993B9BCEF1FC94F40715 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
+		58B80E372FAE01827018A192 /* Pods-environment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-environment.h"; sourceTree = "<group>"; };
+		642D7718E71A7FA83481C316 /* NSFNanoPredicate_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoPredicate_Private.h; path = Classes/Private/NSFNanoPredicate_Private.h; sourceTree = "<group>"; };
+		6E13C4882FB9CBA1CA839501 /* NSFOrderedDictionary.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFOrderedDictionary.m; path = Classes/Advanced/NSFOrderedDictionary.m; sourceTree = "<group>"; };
+		86FAA2942E5B5E64C24EADED /* NSFNanoExpression.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoExpression.h; path = Classes/Public/NSFNanoExpression.h; sourceTree = "<group>"; };
+		93651D37131A3AFD70BC1D0D /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
+		991E956D7161627F69887E04 /* NSFNanoEngine.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoEngine.m; path = Classes/Advanced/NSFNanoEngine.m; sourceTree = "<group>"; };
+		A102DD2AD7A5A3EBF51CBCAE /* NSFNanoResult.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoResult.h; path = Classes/Advanced/NSFNanoResult.h; sourceTree = "<group>"; };
+		A1AEE284CA5E5F21B58034D2 /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
+		A2F611CB4BD252F7C0862008 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
+		AB77973B618A3D107FA0D4AE /* NSFNanoResult_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoResult_Private.h; path = Classes/Private/NSFNanoResult_Private.h; sourceTree = "<group>"; };
+		BB920B2C5BAEF6CE2CE52A5B /* NSFNanoEngine.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoEngine.h; path = Classes/Advanced/NSFNanoEngine.h; sourceTree = "<group>"; };
+		BC1DEF0FC3A0C9A514BC0D40 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
+		BC468142F9BFADBD17605B35 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		C3DC221DC072819D1693E07D /* NanoStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NanoStore.h; path = Classes/Public/NanoStore.h; sourceTree = "<group>"; };
+		C512561C56DB62D1425A07A6 /* NSFNanoSortDescriptor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoSortDescriptor.h; path = Classes/Public/NSFNanoSortDescriptor.h; sourceTree = "<group>"; };
+		C57EEC98774BC387C83F25AD /* NSFNanoExpression_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoExpression_Private.h; path = Classes/Private/NSFNanoExpression_Private.h; sourceTree = "<group>"; };
+		CAA32EB83BAC68D50427EAC5 /* Pods-NanoStore.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NanoStore.xcconfig"; sourceTree = "<group>"; };
+		CF1FE1F6DC6EB3C4115A55F2 /* NSFNanoStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoStore.m; path = Classes/Public/NSFNanoStore.m; sourceTree = "<group>"; };
+		DA8A53A7B2579BAE4C855427 /* NSFNanoSearch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoSearch.m; path = Classes/Public/NSFNanoSearch.m; sourceTree = "<group>"; };
+		DC458D694A8B296DB5678D38 /* NSFNanoSortDescriptor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoSortDescriptor.m; path = Classes/Public/NSFNanoSortDescriptor.m; sourceTree = "<group>"; };
+		E5B96701AD22DF74761BEDDB /* Pods-NanoStore-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-NanoStore-prefix.pch"; sourceTree = "<group>"; };
+		E9F5179C3EFE616C0DBB03A8 /* Pods-NanoStore-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-NanoStore-Private.xcconfig"; sourceTree = "<group>"; };
+		ECDF7035BA907D2D7A4F62F7 /* NSFNanoObjectProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObjectProtocol.h; path = Classes/Public/NSFNanoObjectProtocol.h; sourceTree = "<group>"; };
+		EE95DFE15BCF1C6098B0D4D5 /* NSFNanoPredicate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoPredicate.h; path = Classes/Public/NSFNanoPredicate.h; sourceTree = "<group>"; };
+		F21684A0E963A7E1C848062A /* NSFNanoObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSFNanoObject.h; path = Classes/Public/NSFNanoObject.h; sourceTree = "<group>"; };
+		F9D3C4D5E4FBE0298A5755EC /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = "<group>"; };
+		FBAD5212398B09A67959A99F /* NSFNanoResult.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSFNanoResult.m; path = Classes/Advanced/NSFNanoResult.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		3681D2AEA85A9EC8E5CF634D /* Frameworks */ = {
+		0B59CADB44569EE83D1E8E08 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				ABEBD0273E86B7CACD42279C /* Foundation.framework in Frameworks */,
+				4E8A7C2C649660D715718352 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A93C56B6373F9D189C38DC03 /* Frameworks */ = {
+		AB664BEA92A8E8146DEC2ED8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE8E00A9DB9989CD48B46B2A /* Foundation.framework in Frameworks */,
+				704D3BDA0BBB80E03738FD12 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		1993E3D24BCA7558B5384D09 /* Targets Support Files */ = {
+		06CFECBAF652B0748042DA20 = {
 			isa = PBXGroup;
 			children = (
-				AC04461D15741C6AE54DED2D /* Pods */,
+				A19F0A1507239F82AABD3825 /* Frameworks */,
+				5557237329DBB2C5C3B40011 /* Pods */,
+				7084EA275D48CE743084B508 /* Products */,
+				978B2775BFD46867F88C03D8 /* Targets Support Files */,
 			);
-			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		428DC0C0F91BBBBCA8C2A962 /* iOS */ = {
+		31E9B6E7A0DE30DC12FCE7F7 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				7465D778E1F78D475A10C8FD /* Foundation.framework */,
+				CAA32EB83BAC68D50427EAC5 /* Pods-NanoStore.xcconfig */,
+				E9F5179C3EFE616C0DBB03A8 /* Pods-NanoStore-Private.xcconfig */,
+				3455AA7778BCC0616C0FAD48 /* Pods-NanoStore-dummy.m */,
+				E5B96701AD22DF74761BEDDB /* Pods-NanoStore-prefix.pch */,
 			);
-			name = iOS;
+			name = "Support Files";
+			path = "../Target Support Files/Pods-NanoStore";
 			sourceTree = "<group>";
 		};
-		668BB43A1B18937901E89959 /* Support Files */ = {
+		5557237329DBB2C5C3B40011 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				09AEE6C7BCF6D06E9B52CACF /* Pods-NanoStore.xcconfig */,
-				E0696D7B93267FECAC094576 /* Pods-NanoStore-Private.xcconfig */,
-				F05DF3B583185A3F95B5AB4C /* Pods-NanoStore-dummy.m */,
-				2F55E77821B892EAB270F02A /* Pods-NanoStore-prefix.pch */,
+				6AAD2C09AE0B8EB8B5E43ED4 /* NanoStore */,
 			);
-			name = "Support Files";
-			path = "../Target Support Files/Pods-NanoStore";
+			name = Pods;
 			sourceTree = "<group>";
 		};
-		AC04461D15741C6AE54DED2D /* Pods */ = {
+		6AAD2C09AE0B8EB8B5E43ED4 /* NanoStore */ = {
 			isa = PBXGroup;
 			children = (
-				8806D3A3C939F59B5FE0281D /* Pods-acknowledgements.markdown */,
-				9517DE9D01DAE833246D1B4A /* Pods-acknowledgements.plist */,
-				D6AF36BA6642490C96460859 /* Pods-dummy.m */,
-				B5CD55A04C145FEE704E2A5C /* Pods-environment.h */,
-				BB63A9724E66F946ADFAFBAE /* Pods-resources.sh */,
-				8B08771182EF53394F8CDE6B /* Pods.debug.xcconfig */,
-				CA1930D27C27AFF49123C5F7 /* Pods.release.xcconfig */,
+				26E19468CE618FD2075B7DEA /* NSFNanoBag.h */,
+				19D06AA7E4FC520D28769DD4 /* NSFNanoBag.m */,
+				310C0E7ABC2108C2EE8AC48F /* NSFNanoBag_Private.h */,
+				BB920B2C5BAEF6CE2CE52A5B /* NSFNanoEngine.h */,
+				991E956D7161627F69887E04 /* NSFNanoEngine.m */,
+				48767C877FE4A5AA540E5058 /* NSFNanoEngine_Private.h */,
+				86FAA2942E5B5E64C24EADED /* NSFNanoExpression.h */,
+				4EA75AC7E53D7E90DB19810D /* NSFNanoExpression.m */,
+				C57EEC98774BC387C83F25AD /* NSFNanoExpression_Private.h */,
+				40745197CF4B9A21D3A118F7 /* NSFNanoGlobals.h */,
+				0F86A38D7BB4DC49E7DCAB7C /* NSFNanoGlobals.m */,
+				05967D4EF1E1A32CDF3E18FD /* NSFNanoGlobals_Private.h */,
+				F21684A0E963A7E1C848062A /* NSFNanoObject.h */,
+				37CDEC529D55F78F752E5B41 /* NSFNanoObject.m */,
+				ECDF7035BA907D2D7A4F62F7 /* NSFNanoObjectProtocol.h */,
+				2E3EEFBF1766F4707EF812C2 /* NSFNanoObject_Private.h */,
+				EE95DFE15BCF1C6098B0D4D5 /* NSFNanoPredicate.h */,
+				2635F5E907521CC42CE46D22 /* NSFNanoPredicate.m */,
+				642D7718E71A7FA83481C316 /* NSFNanoPredicate_Private.h */,
+				A102DD2AD7A5A3EBF51CBCAE /* NSFNanoResult.h */,
+				FBAD5212398B09A67959A99F /* NSFNanoResult.m */,
+				AB77973B618A3D107FA0D4AE /* NSFNanoResult_Private.h */,
+				45CFB257557739BE1FA21045 /* NSFNanoSearch.h */,
+				DA8A53A7B2579BAE4C855427 /* NSFNanoSearch.m */,
+				435D0D8D4C9783CBA37C75FA /* NSFNanoSearch_Private.h */,
+				C512561C56DB62D1425A07A6 /* NSFNanoSortDescriptor.h */,
+				DC458D694A8B296DB5678D38 /* NSFNanoSortDescriptor.m */,
+				06FFCA40286DE33B4B3053F5 /* NSFNanoStore.h */,
+				CF1FE1F6DC6EB3C4115A55F2 /* NSFNanoStore.m */,
+				06F2A1BB62353590ACC4AF10 /* NSFNanoStore_Private.h */,
+				34865615AF22A22A2F386356 /* NSFOrderedDictionary.h */,
+				6E13C4882FB9CBA1CA839501 /* NSFOrderedDictionary.m */,
+				C3DC221DC072819D1693E07D /* NanoStore.h */,
+				490EB159BE877DDCBFA8B1CE /* NanoStore_Private.h */,
+				31E9B6E7A0DE30DC12FCE7F7 /* Support Files */,
 			);
-			name = Pods;
-			path = "Target Support Files/Pods";
+			path = NanoStore;
 			sourceTree = "<group>";
 		};
-		B6DBD63863BEACBB05F9F169 /* Pods */ = {
+		7084EA275D48CE743084B508 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				EA12707490E81AB549682258 /* NanoStore */,
+				36D9D64CD9FB536058F9D245 /* libPods.a */,
+				150A3579A9694BB6460CA0AD /* libPods-NanoStore.a */,
 			);
-			name = Pods;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		D2DC6351346B3E0504A91505 = {
+		978B2775BFD46867F88C03D8 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				FA05A664728D720E04C5E02F /* Frameworks */,
-				B6DBD63863BEACBB05F9F169 /* Pods */,
-				F1691D2CB022D1938E1B0CEF /* Products */,
-				1993E3D24BCA7558B5384D09 /* Targets Support Files */,
+				A6AAF5B399EA195EDF712588 /* Pods */,
 			);
+			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		EA12707490E81AB549682258 /* NanoStore */ = {
+		A19F0A1507239F82AABD3825 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				06E7607A831083C1FF8B3D68 /* NSFNanoBag.h */,
-				01A70780C76FA894DC1EF4B5 /* NSFNanoBag.m */,
-				8E8F7760718418E9897989C3 /* NSFNanoBag_Private.h */,
-				75DB5C35A88A72EA2A70372E /* NSFNanoEngine.h */,
-				1910E349C8ED9F1F5B9AE117 /* NSFNanoEngine.m */,
-				D40C0EEF73F1A65D89025926 /* NSFNanoEngine_Private.h */,
-				921AAE497F5E54BCF57E3BEB /* NSFNanoExpression.h */,
-				7A2A6C0B4A0B309593279FC9 /* NSFNanoExpression.m */,
-				43E0B2133B3DB2A71CF3B2CF /* NSFNanoExpression_Private.h */,
-				71E41A4D5A348A84AAA15829 /* NSFNanoGlobals.h */,
-				E0A7B55C127D737CD0760387 /* NSFNanoGlobals.m */,
-				FD35C61631EABDAA59318CDF /* NSFNanoGlobals_Private.h */,
-				6A0E4309AEA0DA6336AD2980 /* NSFNanoObject.h */,
-				94BA2F869EA5CFBFFD8E774C /* NSFNanoObject.m */,
-				BFE02B2E90E37C6E748AA29F /* NSFNanoObjectProtocol.h */,
-				197BFB28D85AD495A7032FC1 /* NSFNanoObject_Private.h */,
-				03F1C36DF2F1865C919DE4B2 /* NSFNanoPredicate.h */,
-				8C1ACF0F6BF09985944E26F0 /* NSFNanoPredicate.m */,
-				6F660E1CD36227D963CC16D7 /* NSFNanoPredicate_Private.h */,
-				C2E4FD0DCC091D96B24B60D3 /* NSFNanoResult.h */,
-				7DD39F99C067F086130E3C99 /* NSFNanoResult.m */,
-				762863DE5511E098539A5267 /* NSFNanoResult_Private.h */,
-				7088B28741581D50D050F4D7 /* NSFNanoSearch.h */,
-				EBD00A8F308D14816BDA785E /* NSFNanoSearch.m */,
-				5EFE8BFC3F654C4E4E1E67F5 /* NSFNanoSearch_Private.h */,
-				F6EB3191F034A80AE56075D5 /* NSFNanoSortDescriptor.h */,
-				46E0398C5190975250E9F637 /* NSFNanoSortDescriptor.m */,
-				4F74589A60C2A6209078143B /* NSFNanoStore.h */,
-				8F42EDD7AE123E71A777AEA0 /* NSFNanoStore.m */,
-				78EB5E9A8CBE3487843D7772 /* NSFNanoStore_Private.h */,
-				E2E1CE880FE4AB0219EC2D88 /* NSFOrderedDictionary.h */,
-				190BB20241CCA6547CA81D9B /* NSFOrderedDictionary.m */,
-				5DE8095783DA8B129FFF76FC /* NanoStore.h */,
-				EC7F8F45C30C598E45CD442D /* NanoStore_Private.h */,
-				668BB43A1B18937901E89959 /* Support Files */,
+				B17404C3BA9B04D1951701BF /* iOS */,
 			);
-			path = NanoStore;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		F1691D2CB022D1938E1B0CEF /* Products */ = {
+		A6AAF5B399EA195EDF712588 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				5FF0E088F277F5B0FC6A332E /* libPods.a */,
-				0BBBD34F0B1A9F1A06D87374 /* libPods-NanoStore.a */,
+				93651D37131A3AFD70BC1D0D /* Pods-acknowledgements.markdown */,
+				BC1DEF0FC3A0C9A514BC0D40 /* Pods-acknowledgements.plist */,
+				F9D3C4D5E4FBE0298A5755EC /* Pods-dummy.m */,
+				58B80E372FAE01827018A192 /* Pods-environment.h */,
+				A1AEE284CA5E5F21B58034D2 /* Pods-resources.sh */,
+				5898993B9BCEF1FC94F40715 /* Pods.debug.xcconfig */,
+				A2F611CB4BD252F7C0862008 /* Pods.release.xcconfig */,
 			);
-			name = Products;
+			name = Pods;
+			path = "Target Support Files/Pods";
 			sourceTree = "<group>";
 		};
-		FA05A664728D720E04C5E02F /* Frameworks */ = {
+		B17404C3BA9B04D1951701BF /* iOS */ = {
 			isa = PBXGroup;
 			children = (
-				428DC0C0F91BBBBCA8C2A962 /* iOS */,
+				BC468142F9BFADBD17605B35 /* Foundation.framework */,
 			);
-			name = Frameworks;
+			name = iOS;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		8433C2212D3B3BB837D9A4D1 /* Headers */ = {
+		FA886D21503C40E2BB3CD24F /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				60DCF13E62EB12533B6E5B54 /* NSFNanoBag.h in Headers */,
-				2BC73D9E3F44B58D28BC6CFB /* NSFNanoBag_Private.h in Headers */,
-				CBD59AA2756F2B926EDBA137 /* NSFNanoEngine.h in Headers */,
-				532A43ED76045EFC3E398C5F /* NSFNanoEngine_Private.h in Headers */,
-				ECF2A333FDC2FA2B9AB118DC /* NSFNanoExpression.h in Headers */,
-				237AF629503884E8DD95DBC4 /* NSFNanoExpression_Private.h in Headers */,
-				FCAD0EA82541ADD8452EAAC5 /* NSFNanoGlobals.h in Headers */,
-				C6B067EEEE561A9A9ACD0BEE /* NSFNanoGlobals_Private.h in Headers */,
-				A63D1A9C13E336E79B329DB3 /* NSFNanoObject.h in Headers */,
-				4BB353BA07AE2FBE785DAD7D /* NSFNanoObjectProtocol.h in Headers */,
-				8AB2CF4EA990DCE80A70E47C /* NSFNanoObject_Private.h in Headers */,
-				9BD5D2D24A598BA606CB1A29 /* NSFNanoPredicate.h in Headers */,
-				F6E9145184BC284BC23E55BE /* NSFNanoPredicate_Private.h in Headers */,
-				7B6E0967BAD0B5567B602366 /* NSFNanoResult.h in Headers */,
-				5B3754C5744F9BEAA12BCD85 /* NSFNanoResult_Private.h in Headers */,
-				A0428C456BC7069CFCBBFE4A /* NSFNanoSearch.h in Headers */,
-				0C274E59860EF307B4C545B2 /* NSFNanoSearch_Private.h in Headers */,
-				EC7DF7C43DC95DC93B43087B /* NSFNanoSortDescriptor.h in Headers */,
-				E5DDBDFD4D7AEB8F16F91573 /* NSFNanoStore.h in Headers */,
-				1A4743DEBB1E4D1339B58C68 /* NSFNanoStore_Private.h in Headers */,
-				3052CFA77945A93D56F8D408 /* NSFOrderedDictionary.h in Headers */,
-				CA1465ED1DDEB15B0D2266D1 /* NanoStore.h in Headers */,
-				38274177FBDFB7175BBBAE82 /* NanoStore_Private.h in Headers */,
+				59B3B61570AD9FE0D676AB7D /* NSFNanoBag.h in Headers */,
+				FBD11389E6CE4E983FB96575 /* NSFNanoBag_Private.h in Headers */,
+				D8AED02B9C48998E812C2B13 /* NSFNanoEngine.h in Headers */,
+				2FE896BC5A8EE3D7AF75A409 /* NSFNanoEngine_Private.h in Headers */,
+				FE00CB794A29A0D0429B0563 /* NSFNanoExpression.h in Headers */,
+				7B5E94D95F8F63F9AB40AFED /* NSFNanoExpression_Private.h in Headers */,
+				DCA205CCA706801D30B3A0A4 /* NSFNanoGlobals.h in Headers */,
+				F838A0B0FEA27373C1F390DD /* NSFNanoGlobals_Private.h in Headers */,
+				054F15F14A5E6A711F701572 /* NSFNanoObject.h in Headers */,
+				2B8A2732F69803E995ECDCCD /* NSFNanoObjectProtocol.h in Headers */,
+				C6E4E129EF4BE4295590B4AE /* NSFNanoObject_Private.h in Headers */,
+				6602FCCCC566353EA22CBCE3 /* NSFNanoPredicate.h in Headers */,
+				3DC531F2DD982EB8AFB66E22 /* NSFNanoPredicate_Private.h in Headers */,
+				82C3D936F0E6D86A59E6F067 /* NSFNanoResult.h in Headers */,
+				FC99839D6F7A583D33E9B65A /* NSFNanoResult_Private.h in Headers */,
+				9AC2847D5A3DE39355F26EB6 /* NSFNanoSearch.h in Headers */,
+				9E8D6F3616E48F7D09F6028E /* NSFNanoSearch_Private.h in Headers */,
+				A386C819FACB3F9472507C5E /* NSFNanoSortDescriptor.h in Headers */,
+				0781A101A0AD35A4768657DF /* NSFNanoStore.h in Headers */,
+				41F0B54E41DDE6451B72DA5F /* NSFNanoStore_Private.h in Headers */,
+				85987A4AA94540E1AD75C764 /* NSFOrderedDictionary.h in Headers */,
+				D355E2A29B0393742998A015 /* NanoStore.h in Headers */,
+				7837BE6A4D41A7716B6D6372 /* NanoStore_Private.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		019500D92C6333599834431F /* Pods */ = {
+		2E7D514FCE122EA48773D9AF /* Pods */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 431CD81623C07BB028E86ABD /* Build configuration list for PBXNativeTarget "Pods" */;
+			buildConfigurationList = 08C510436E92F2761028798D /* Build configuration list for PBXNativeTarget "Pods" */;
 			buildPhases = (
-				4242990E9F5D8D489967F7ED /* Sources */,
-				3681D2AEA85A9EC8E5CF634D /* Frameworks */,
+				153133E07D2F1C1BEE905893 /* Sources */,
+				AB664BEA92A8E8146DEC2ED8 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				6CA477EFD5170EC2AFFBA2A6 /* PBXTargetDependency */,
+				9001F31B2ABE4520E4DBB7D9 /* PBXTargetDependency */,
 			);
 			name = Pods;
 			productName = Pods;
-			productReference = 5FF0E088F277F5B0FC6A332E /* libPods.a */;
+			productReference = 36D9D64CD9FB536058F9D245 /* libPods.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		9AF252C6D26A6762EEA62382 /* Pods-NanoStore */ = {
+		49310D41BC31A00B3C60D173 /* Pods-NanoStore */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 63C4C7D4FA9B0915DA8821B3 /* Build configuration list for PBXNativeTarget "Pods-NanoStore" */;
+			buildConfigurationList = 062586CEADFF388FD2DBF8E3 /* Build configuration list for PBXNativeTarget "Pods-NanoStore" */;
 			buildPhases = (
-				AED5F370196E8AFC0082A311 /* Sources */,
-				A93C56B6373F9D189C38DC03 /* Frameworks */,
-				8433C2212D3B3BB837D9A4D1 /* Headers */,
+				51531798AB5AE2EDF217842C /* Sources */,
+				0B59CADB44569EE83D1E8E08 /* Frameworks */,
+				FA886D21503C40E2BB3CD24F /* Headers */,
 			);
 			buildRules = (
 			);
@@ -315,108 +315,76 @@
 			);
 			name = "Pods-NanoStore";
 			productName = "Pods-NanoStore";
-			productReference = 0BBBD34F0B1A9F1A06D87374 /* libPods-NanoStore.a */;
+			productReference = 150A3579A9694BB6460CA0AD /* libPods-NanoStore.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		8173DE0D7D1355486E3123EC /* Project object */ = {
+		0F5268D17D10826FCA675BCD /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0640;
 			};
-			buildConfigurationList = 2713B74EC1C610A40CC1A6B1 /* Build configuration list for PBXProject "Pods" */;
+			buildConfigurationList = 7ED7B0CBCA6452CC90A0824A /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 			);
-			mainGroup = D2DC6351346B3E0504A91505;
-			productRefGroup = F1691D2CB022D1938E1B0CEF /* Products */;
+			mainGroup = 06CFECBAF652B0748042DA20;
+			productRefGroup = 7084EA275D48CE743084B508 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				019500D92C6333599834431F /* Pods */,
-				9AF252C6D26A6762EEA62382 /* Pods-NanoStore */,
+				2E7D514FCE122EA48773D9AF /* Pods */,
+				49310D41BC31A00B3C60D173 /* Pods-NanoStore */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
-		4242990E9F5D8D489967F7ED /* Sources */ = {
+		153133E07D2F1C1BEE905893 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				588F0C072793D614F26F2EA6 /* Pods-dummy.m in Sources */,
+				E4AAE55EDCF92607AB9E4E4A /* Pods-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		AED5F370196E8AFC0082A311 /* Sources */ = {
+		51531798AB5AE2EDF217842C /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				894891CE6C0A812E4039C347 /* NSFNanoBag.m in Sources */,
-				5DFCE4227537BB4FCCE57990 /* NSFNanoEngine.m in Sources */,
-				26A84372711B656B2764A741 /* NSFNanoExpression.m in Sources */,
-				8117A26135FB6D43E233E4FC /* NSFNanoGlobals.m in Sources */,
-				71037418E0FEE4C07D0A5074 /* NSFNanoObject.m in Sources */,
-				4440520584C588A3149ED091 /* NSFNanoPredicate.m in Sources */,
-				C2EF69BEC11ABA58ABE207BA /* NSFNanoResult.m in Sources */,
-				DB142A06A41A607E8D6DF1AE /* NSFNanoSearch.m in Sources */,
-				FAECCD1493C750D8EA34A6BD /* NSFNanoSortDescriptor.m in Sources */,
-				6E218B553A7ECE3C5E3EC91D /* NSFNanoStore.m in Sources */,
-				72D15E52663D627AD4069645 /* NSFOrderedDictionary.m in Sources */,
-				2D3C116C6A1B5181F75513D9 /* Pods-NanoStore-dummy.m in Sources */,
+				950DDB12D4A6E89150AC1A55 /* NSFNanoBag.m in Sources */,
+				36170BB70EFAE3F13D81DC83 /* NSFNanoEngine.m in Sources */,
+				9AFE5B836A98A81FF480701C /* NSFNanoExpression.m in Sources */,
+				9FD7420320D2CD3E171BA2ED /* NSFNanoGlobals.m in Sources */,
+				EBE419B239A8513259CE2DED /* NSFNanoObject.m in Sources */,
+				8EA2D966E5843705E6297004 /* NSFNanoPredicate.m in Sources */,
+				12B60BDCDD7FF66828FE7A3E /* NSFNanoResult.m in Sources */,
+				9588A43FFE299CB91F4230CF /* NSFNanoSearch.m in Sources */,
+				41764CF3244E5A0714FD3A9A /* NSFNanoSortDescriptor.m in Sources */,
+				6DC8A758421253FD7EAF0C96 /* NSFNanoStore.m in Sources */,
+				BF208A8AA89F04840AE410F8 /* NSFOrderedDictionary.m in Sources */,
+				D2255DEA2B31B0E17E25192C /* Pods-NanoStore-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		6CA477EFD5170EC2AFFBA2A6 /* PBXTargetDependency */ = {
+		9001F31B2ABE4520E4DBB7D9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "Pods-NanoStore";
-			target = 9AF252C6D26A6762EEA62382 /* Pods-NanoStore */;
-			targetProxy = B3DCA5B90D053CAE1810C9B6 /* PBXContainerItemProxy */;
+			target = 49310D41BC31A00B3C60D173 /* Pods-NanoStore */;
+			targetProxy = E8E9BD7C1B75990E9F31FCA3 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		3D7E0E7F019AF541258419C2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E0696D7B93267FECAC094576 /* Pods-NanoStore-Private.xcconfig */;
-			buildSettings = {
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/Pods-NanoStore/Pods-NanoStore-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-			};
-			name = Debug;
-		};
-		7069661BBC34999081DACAF9 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = CA1930D27C27AFF49123C5F7 /* Pods.release.xcconfig */;
-			buildSettings = {
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-			};
-			name = Release;
-		};
-		A5A9D9B851455E99F93914ED /* Release */ = {
+		0A9E37D4D5A01B3665F33EE7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -433,10 +401,15 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
+				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -444,31 +417,31 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				ONLY_ACTIVE_ARCH = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SYMROOT = "${SRCROOT}/../build";
-				VALIDATE_PRODUCT = YES;
 			};
-			name = Release;
+			name = Debug;
 		};
-		A7858298A9BE3A345533039B /* Debug */ = {
+		4E6BE1756A0631C6CCA329F9 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8B08771182EF53394F8CDE6B /* Pods.debug.xcconfig */;
+			baseConfigurationReference = E9F5179C3EFE616C0DBB03A8 /* Pods-NanoStore-Private.xcconfig */;
 			buildSettings = {
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Pods-NanoStore/Pods-NanoStore-prefix.pch";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
-		A7E907328D0F7B4F5057A928 /* Release */ = {
+		72F56477A5F1EE9EAC3BFA72 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E0696D7B93267FECAC094576 /* Pods-NanoStore-Private.xcconfig */;
+			baseConfigurationReference = E9F5179C3EFE616C0DBB03A8 /* Pods-NanoStore-Private.xcconfig */;
 			buildSettings = {
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/Pods-NanoStore/Pods-NanoStore-prefix.pch";
@@ -482,7 +455,7 @@
 			};
 			name = Release;
 		};
-		B5832A3D163E23D868CCAE84 /* Debug */ = {
+		CF11F58C9C85BC14D316B102 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -499,15 +472,10 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -515,43 +483,75 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
-				ONLY_ACTIVE_ARCH = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SYMROOT = "${SRCROOT}/../build";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		E26E34A018B843C894BB1C66 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A2F611CB4BD252F7C0862008 /* Pods.release.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		FFBA36AF4250BDCD6F64DF56 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5898993B9BCEF1FC94F40715 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		2713B74EC1C610A40CC1A6B1 /* Build configuration list for PBXProject "Pods" */ = {
+		062586CEADFF388FD2DBF8E3 /* Build configuration list for PBXNativeTarget "Pods-NanoStore" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B5832A3D163E23D868CCAE84 /* Debug */,
-				A5A9D9B851455E99F93914ED /* Release */,
+				4E6BE1756A0631C6CCA329F9 /* Debug */,
+				72F56477A5F1EE9EAC3BFA72 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		431CD81623C07BB028E86ABD /* Build configuration list for PBXNativeTarget "Pods" */ = {
+		08C510436E92F2761028798D /* Build configuration list for PBXNativeTarget "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				A7858298A9BE3A345533039B /* Debug */,
-				7069661BBC34999081DACAF9 /* Release */,
+				FFBA36AF4250BDCD6F64DF56 /* Debug */,
+				E26E34A018B843C894BB1C66 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		63C4C7D4FA9B0915DA8821B3 /* Build configuration list for PBXNativeTarget "Pods-NanoStore" */ = {
+		7ED7B0CBCA6452CC90A0824A /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				3D7E0E7F019AF541258419C2 /* Debug */,
-				A7E907328D0F7B4F5057A928 /* Release */,
+				0A9E37D4D5A01B3665F33EE7 /* Debug */,
+				CF11F58C9C85BC14D316B102 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = 8173DE0D7D1355486E3123EC /* Project object */;
+	rootObject = 0F5268D17D10826FCA675BCD /* Project object */;
 }
diff --git a/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods-NanoStore.xcscheme b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods-NanoStore.xcscheme
new file mode 100644
index 0000000..80055b6
--- /dev/null
+++ b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods-NanoStore.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0640"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "49310D41BC31A00B3C60D173"
+               BuildableName = "libPods-NanoStore.a"
+               BlueprintName = "Pods-NanoStore"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods.xcscheme b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods.xcscheme
new file mode 100644
index 0000000..cbbcacb
--- /dev/null
+++ b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/Pods.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0640"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2E7D514FCE122EA48773D9AF"
+               BuildableName = "libPods.a"
+               BlueprintName = "Pods"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/xcschememanagement.plist b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..7175af0
--- /dev/null
+++ b/vendor/Pods/Pods.xcodeproj/xcuserdata/gurupratap.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Pods-NanoStore.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+		</dict>
+		<key>Pods.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict/>
+</dict>
+</plist>
diff --git a/vendor/Pods/Target Support Files/Pods/Pods-environment.h b/vendor/Pods/Target Support Files/Pods/Pods-environment.h
index ed5898e..ab41541 100644
--- a/vendor/Pods/Target Support Files/Pods/Pods-environment.h	
+++ b/vendor/Pods/Target Support Files/Pods/Pods-environment.h	
@@ -9,6 +9,6 @@
 // NanoStore
 #define COCOAPODS_POD_AVAILABLE_NanoStore
 #define COCOAPODS_VERSION_MAJOR_NanoStore 2
-#define COCOAPODS_VERSION_MINOR_NanoStore 7
-#define COCOAPODS_VERSION_PATCH_NanoStore 7
+#define COCOAPODS_VERSION_MINOR_NanoStore 6
+#define COCOAPODS_VERSION_PATCH_NanoStore 4
 
diff --git a/vendor/Pods/build-iPhoneSimulator/libPods-NanoStore.a b/vendor/Pods/build-iPhoneSimulator/libPods-NanoStore.a
index 0bdbb27..8b05929 100644
Binary files a/vendor/Pods/build-iPhoneSimulator/libPods-NanoStore.a and b/vendor/Pods/build-iPhoneSimulator/libPods-NanoStore.a differ