diff --git a/.travis.yml b/.travis.yml
index acff8b7..8ad958a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 branches:
  only:
  - master
diff --git a/README.md b/README.md
index 565e953..669259f 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Tablet respects cells reusability feature and built with performace in mind. See
 
 - iOS 8.0+
 - Xcode 7.0+
+- Swift 2.2
 
 ## Installation
 
diff --git a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate
index 2abe584..1f94a17 100644
Binary files a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Tablet/TableDirector.swift b/Tablet/TableDirector.swift
index d50bd79..e5985ab 100644
--- a/Tablet/TableDirector.swift
+++ b/Tablet/TableDirector.swift
@@ -37,7 +37,7 @@ public class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate
         self.tableView.delegate = self
         self.tableView.dataSource = self
 
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "didReceiveAction:", name: TabletNotifications.CellAction, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(didReceiveAction), name: TabletNotifications.CellAction, object: nil)
     }
     
     deinit {
diff --git a/Tablet/TableSectionBuilder.swift b/Tablet/TableSectionBuilder.swift
index 57a2f3b..e93a137 100644
--- a/Tablet/TableSectionBuilder.swift
+++ b/Tablet/TableSectionBuilder.swift
@@ -81,13 +81,14 @@ public class TableSectionBuilder {
 
     // MARK: Internal
     
-    func builderAtIndex(var index: Int) -> (RowBuilder, Int)? {
+    func builderAtIndex(index: Int) -> (RowBuilder, Int)? {
         
+        var builderIndex = index
         for builder in builders {
-            if index < builder.numberOfRows {
-                return (builder, index)
+            if builderIndex < builder.numberOfRows {
+                return (builder, builderIndex)
             }
-            index -= builder.numberOfRows
+            builderIndex -= builder.numberOfRows
         }
         
         return nil
diff --git a/Tablet/Tablet.swift b/Tablet/Tablet.swift
index 0cfc919..3569c46 100644
--- a/Tablet/Tablet.swift
+++ b/Tablet/Tablet.swift
@@ -102,7 +102,7 @@ public class Action {
 */
 public protocol ConfigurableCell {
 
-    typealias Item
+    associatedtype Item
 
     static func reusableIdentifier() -> String
     static func estimatedHeight() -> Float