From 67883f7e8ab7ca98aedb1b53232dd26f6182395e Mon Sep 17 00:00:00 2001
From: Juha Salo <juha.salo@solinor.com>
Date: Thu, 24 Mar 2016 18:55:13 +0200
Subject: [PATCH 01/11] Migrate to new version of libraries and swift 2.2

---
 Cartfile                                      |   6 +-
 Cartfile.private                              |   4 +-
 Cartfile.resolved                             |  10 +-
 Clutch/Crypto.swift                           |  16 +-
 Clutch/Extensions.swift                       |  34 +-
 Clutch/IQKeybordManagerSwift/.DS_Store        | Bin 0 -> 6148 bytes
 .../Categories/IQUIScrollView+Additions.swift |  47 +
 .../IQUITextFieldView+Additions.swift         |  56 +
 .../IQUIViewController+Additions.swift}       |  37 +-
 .../IQToolbar/IQToolbar.swift                 | 101 --
 .../IQButtonBarArrowLeft@2x.png               | Bin 328 -> 0 bytes
 .../IQButtonBarArrowRight@2x.png              | Bin 351 -> 0 bytes
 Clutch/Networking.swift                       |   8 +-
 Clutch/SPHAddCardViewController.swift         |  32 +-
 Clutch/SPHClutch.storyboard                   |   7 +-
 Clutch/SPHClutch.swift                        |  54 +-
 Clutch/SPHClutchFormLabel.swift               |   2 +-
 Clutch/SPHClutchFormatter.swift               |  20 +-
 Clutch/SPHClutchTextField.swift               |   4 +-
 .../Categories/IQNSArray+Sort.swift           |  33 +-
 .../Categories/IQUIScrollView+Additions.swift |  47 +
 .../IQUITextFieldView+Additions.swift         |  56 +
 .../Categories/IQUIView+Hierarchy.swift       | 103 +-
 .../IQUIViewController+Additions.swift        |  46 +
 .../Categories/IQUIWindow+Hierarchy.swift     |   8 +-
 .../IQKeyboardManagerConstants.swift          |   5 +-
 .../IQKeyboardManagerConstantsInternal.swift  |  22 +-
 .../IQKeyboardManager.swift                   | 994 ++++++++++--------
 .../IQKeyboardReturnKeyHandler.swift          | 139 +--
 .../IQTextView/IQTextView.swift               |  35 +-
 .../IQToolbar/IQBarButtonItem.swift           |  79 ++
 .../IQToolbar/IQTitleBarButtonItem.swift      |  44 +-
 .../IQToolbar/IQToolbar.swift                 | 191 ++++
 .../IQUIView+IQKeyboardToolbar.swift          | 668 ++++++++----
 .../IQButtonBarArrowLeft.png                  | Bin 0 -> 886 bytes
 .../IQButtonBarArrowLeft@2x.png               | Bin 0 -> 1793 bytes
 .../IQButtonBarArrowLeft@3x.png               | Bin 0 -> 1815 bytes
 .../IQButtonBarArrowRight.png                 | Bin 0 -> 943 bytes
 .../IQButtonBarArrowRight@2x.png              | Bin 0 -> 1786 bytes
 .../IQButtonBarArrowRight@3x.png              | Bin 0 -> 1844 bytes
 .../de.lproj/IQKeyboardManager.strings        |   0
 .../en.lproj/IQKeyboardManager.strings        |   0
 .../es.lproj/IQKeyboardManager.strings        |   0
 .../fr.lproj/IQKeyboardManager.strings        |  13 +
 .../zh-Hans/IQKeyboardManager.strings         |   0
 .../zh-Hant/IQKeyboardManager.strings         |   0
 readme.md                                     |   5 +-
 47 files changed, 1892 insertions(+), 1034 deletions(-)
 create mode 100644 Clutch/IQKeybordManagerSwift/.DS_Store
 create mode 100755 Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
 create mode 100755 Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
 rename Clutch/IQKeybordManagerSwift/{IQToolbar/IQBarButtonItem.swift => Categories/IQUIViewController+Additions.swift} (59%)
 mode change 100644 => 100755
 delete mode 100644 Clutch/IQKeybordManagerSwift/IQToolbar/IQToolbar.swift
 delete mode 100644 Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png
 delete mode 100644 Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Categories/IQNSArray+Sort.swift (66%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/Categories/IQUIScrollView+Additions.swift
 create mode 100755 IQKeyboardManagerSwift/Categories/IQUITextFieldView+Additions.swift
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Categories/IQUIView+Hierarchy.swift (77%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/Categories/IQUIViewController+Additions.swift
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Categories/IQUIWindow+Hierarchy.swift (91%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Constants/IQKeyboardManagerConstants.swift (98%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Constants/IQKeyboardManagerConstantsInternal.swift (67%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/IQKeyboardManager.swift (64%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/IQKeyboardReturnKeyHandler.swift (74%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/IQTextView/IQTextView.swift (71%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/IQToolbar/IQBarButtonItem.swift
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/IQToolbar/IQTitleBarButtonItem.swift (55%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/IQToolbar/IQToolbar.swift
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/IQToolbar/IQUIView+IQKeyboardToolbar.swift (51%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft.png
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@3x.png
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight.png
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@3x.png
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Resources/IQKeyboardManager.bundle/de.lproj/IQKeyboardManager.strings (100%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Resources/IQKeyboardManager.bundle/en.lproj/IQKeyboardManager.strings (100%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Resources/IQKeyboardManager.bundle/es.lproj/IQKeyboardManager.strings (100%)
 mode change 100644 => 100755
 create mode 100755 IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/fr.lproj/IQKeyboardManager.strings
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Resources/IQKeyboardManager.bundle/zh-Hans/IQKeyboardManager.strings (100%)
 mode change 100644 => 100755
 rename {Clutch/IQKeybordManagerSwift => IQKeyboardManagerSwift}/Resources/IQKeyboardManager.bundle/zh-Hant/IQKeyboardManager.strings (100%)
 mode change 100644 => 100755

diff --git a/Cartfile b/Cartfile
index 81cd5e0..f2a39a7 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" >= 1.2
-github "SwiftyJSON/SwiftyJSON" >= 2.2.1
-github "pyrtsa/CryptoSwift" "device-tests"
+github "Alamofire/Alamofire" ~> 3.3.0
+github "SwiftyJSON/SwiftyJSON" ~> 2.3.1
+github "krzyzanowskim/CryptoSwift" ~> 0.3
diff --git a/Cartfile.private b/Cartfile.private
index 5aca623..cf5a254 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1,2 +1,2 @@
-github "Quick/Quick" "6c7b90f27c46e2317f56c86a8d82e5881e4015b0" # master branch
-github "Quick/Nimble" "b89db8654c5f134d4f68e706b6da4a5581cb2001" # master branch
+github "Quick/Quick" ~> 0.9.1
+github "Quick/Nimble" ~> 3.2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 903aa64..e8d824c 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Alamofire/Alamofire" "1.3.1"
-github "pyrtsa/CryptoSwift" "e28bd0961a4448d3c071b91a029736d5d60deec9"
-github "Quick/Nimble" "b89db8654c5f134d4f68e706b6da4a5581cb2001"
-github "Quick/Quick" "6c7b90f27c46e2317f56c86a8d82e5881e4015b0"
-github "SwiftyJSON/SwiftyJSON" "2.2.1"
+github "Alamofire/Alamofire" "3.3.0"
+github "krzyzanowskim/CryptoSwift" "0.3"
+github "Quick/Nimble" "v3.2.0"
+github "Quick/Quick" "v0.9.1"
+github "SwiftyJSON/SwiftyJSON" "2.3.3"
diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index 15f30ba..b32860a 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -15,21 +15,21 @@ public func getRequestId() -> String {
 
 /// Returns Optional SecKeyRef from given certificate in DER-format.
 ///
-/// :param:   DER-formatted certificate
-/// :returns: SecKeyRef or Nil.
+/// - parameter   DER-formatted: certificate
+/// - returns: SecKeyRef or Nil.
 private func loadDER(publicKeyFileContent: NSData) -> SecKeyRef? {
     let certificate = SecCertificateCreateWithData(kCFAllocatorDefault, publicKeyFileContent as CFData).takeUnretainedValue()
     let policy = SecPolicyCreateBasicX509().takeUnretainedValue();
     var unmanagedTrust : Unmanaged<SecTrust>? = nil
     let status = SecTrustCreateWithCertificates(certificate, policy, &unmanagedTrust)
     if (status != 0) {
-        println("SecTrustCreateWithCertificates fail. Error Code: \(status)");
+        print("SecTrustCreateWithCertificates fail. Error Code: \(status)");
         return nil
     }
     let trust = unmanagedTrust!.takeUnretainedValue()
     let evaluateStatus = SecTrustEvaluate(trust, nil)
     if (evaluateStatus != 0) {
-        println("SecTrustEvaluate fail. Error Code: \(evaluateStatus)");
+        print("SecTrustEvaluate fail. Error Code: \(evaluateStatus)");
         return nil
     }
     return SecTrustCopyPublicKey(trust).takeUnretainedValue();
@@ -38,19 +38,19 @@ private func loadDER(publicKeyFileContent: NSData) -> SecKeyRef? {
 private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
     
     let blockSize = Int(SecKeyGetBlockSize(publicKey) - 11)
-    var encryptedData = NSMutableData()
+    let encryptedData = NSMutableData()
     let blockCount = Int(ceil(Double(content.length) / Double(blockSize)))
 
     for i in 0..<blockCount {
         var cipherLen = SecKeyGetBlockSize(publicKey)
         var cipher = [UInt8](count: Int(cipherLen), repeatedValue: 0)
         let bufferSize = min(blockSize,(content.length - i * blockSize))
-        var buffer = content.subdataWithRange(NSMakeRange(i*blockSize, bufferSize))
-        let status = SecKeyEncrypt(publicKey, SecPadding(kSecPaddingOAEP), UnsafePointer<UInt8>(buffer.bytes), buffer.length, &cipher, &cipherLen)
+        let buffer = content.subdataWithRange(NSMakeRange(i*blockSize, bufferSize))
+        let status = SecKeyEncrypt(publicKey, SecPadding.OAEP, UnsafePointer<UInt8>(buffer.bytes), buffer.length, &cipher, &cipherLen)
         if (status == noErr){
             encryptedData.appendBytes(cipher, length: Int(cipherLen))
         }else{
-            println("SecKeyEncrypt fail. Error Code: \(status)")
+            print("SecKeyEncrypt fail. Error Code: \(status)")
             return nil
         }
     }
diff --git a/Clutch/Extensions.swift b/Clutch/Extensions.swift
index c25b8b5..8e9a6a0 100644
--- a/Clutch/Extensions.swift
+++ b/Clutch/Extensions.swift
@@ -25,27 +25,27 @@ public struct Inset {
 internal extension String {
 
 	/// Get a given substring of a string
-	/// :param: r The range of the substring wanted
-	/// :returns: The found substring
+	/// - parameter r: The range of the substring wanted
+	/// - returns: The found substring
 	subscript (r: Range<Int>) -> String {
 		get {
-			let startIndex = advance(self.startIndex, r.startIndex)
-			let endIndex = advance(startIndex, r.endIndex - r.startIndex)
+			let startIndex = self.startIndex.advancedBy(r.startIndex)
+			let endIndex = startIndex.advancedBy(r.endIndex - r.startIndex)
 			
 			return self[Range(start: startIndex, end: endIndex)]
 		}
 	}
     /// Returns matches for given regexp
-    /// :param: regex The pattern to evaluate
-    /// :returns: Found matches as an array
+    /// - parameter regex: The pattern to evaluate
+    /// - returns: Found matches as an array
     func matchesForRegex(regex: String!) -> [String] {
         
-        let regex = NSRegularExpression(pattern: regex,
-            options: nil, error: nil)!
+        let regex = try! NSRegularExpression(pattern: regex,
+            options: [])
         let nsString = self as NSString
         let results = regex.matchesInString(nsString as String,
-            options: nil, range: NSMakeRange(0, nsString.length))
-            as! [NSTextCheckingResult]
+            options: [], range: NSMakeRange(0, nsString.length))
+            
 		
         var strings = [String]()
         
@@ -63,8 +63,8 @@ internal extension String {
     /// appends optional trailing string if longer
     /// Source: https://gist.github.com/aorcsik/c8210a84f163b1b644c0
     func truncate(length: Int, trailing: String? = nil) -> String {
-        if count(self) > length {
-            return self.substringToIndex(advance(self.startIndex, length)) + (trailing ?? "")
+        if self.characters.count > length {
+            return self.substringToIndex(self.startIndex.advancedBy(length)) + (trailing ?? "")
         } else {
             return self
         }
@@ -77,9 +77,9 @@ internal extension String {
 internal extension UIColor {
 	
 	/// Convenience method for initializing with 0-255 color values
-	/// :param: red   The red color value
-	/// :param: green The green color value
-	/// :param: blue  The blue color value
+	/// - parameter red:   The red color value
+	/// - parameter green: The green color value
+	/// - parameter blue:  The blue color value
 	convenience init(red: Int, green: Int, blue: Int) {
 		assert(red >= 0 && red <= 255, "Invalid red component")
 		assert(green >= 0 && green <= 255, "Invalid green component")
@@ -89,7 +89,7 @@ internal extension UIColor {
 	}
 	
 	/// Convenience method for initializing with a 0xFFFFFF-0x000000 color value
-	/// :param: hexInt The hexadecimal integer color value
+	/// - parameter hexInt: The hexadecimal integer color value
 	convenience init(hexInt: Int) {
 		self.init(red: (hexInt >> 16) & 0xff, green: (hexInt >> 8) & 0xff, blue: hexInt & 0xff)
 	}
@@ -106,7 +106,7 @@ public extension UIViewController {
         controller.successHandler = success
         controller.errorHandler = error
         
-        var nav = UINavigationController(rootViewController: controller)
+        let nav = UINavigationController(rootViewController: controller)
         nav.modalPresentationStyle = UIModalPresentationStyle.Popover
         let ppc = nav.popoverPresentationController!
         let minimunSize = controller.view.systemLayoutSizeFittingSize(UILayoutFittingCompressedSize)
diff --git a/Clutch/IQKeybordManagerSwift/.DS_Store b/Clutch/IQKeybordManagerSwift/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
new file mode 100755
index 0000000..53f2bcf
--- /dev/null
+++ b/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
@@ -0,0 +1,47 @@
+//
+//  IQUIScrollView+Additions.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+import UIKit
+
+private var kIQShouldRestoreScrollViewContentOffset = "kIQShouldRestoreScrollViewContentOffset"
+
+public extension UIScrollView {
+    
+    /**
+     To set customized distance from keyboard for textField/textView. Can't be less than zero
+     */
+    public var shouldRestoreScrollViewContentOffset: Bool {
+        get {
+            
+            if let aValue = objc_getAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset) as? Bool {
+                return aValue
+            } else {
+                return false
+            }
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
new file mode 100755
index 0000000..9cc0f3e
--- /dev/null
+++ b/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
@@ -0,0 +1,56 @@
+//
+//  IQUITextFieldView+Additions.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+import UIKit
+
+/**
+Uses default keyboard distance for textField.
+*/
+public let kIQUseDefaultKeyboardDistance = CGFloat.max
+
+private var kIQKeyboardDistanceFromTextField = "kIQKeyboardDistanceFromTextField"
+
+/**
+UIView category for managing UITextField/UITextView
+*/
+public extension UIView {
+
+    /**
+    To set customized distance from keyboard for textField/textView. Can't be less than zero
+    */
+    public var keyboardDistanceFromTextField: CGFloat {
+        get {
+            
+            if let aValue = objc_getAssociatedObject(self, &kIQKeyboardDistanceFromTextField) as? CGFloat {
+                return aValue
+            } else {
+                return kIQUseDefaultKeyboardDistance
+            }
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQKeyboardDistanceFromTextField, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
+
diff --git a/Clutch/IQKeybordManagerSwift/IQToolbar/IQBarButtonItem.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift
old mode 100644
new mode 100755
similarity index 59%
rename from Clutch/IQKeybordManagerSwift/IQToolbar/IQBarButtonItem.swift
rename to Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift
index 2198379..8d6abb3
--- a/Clutch/IQKeybordManagerSwift/IQToolbar/IQBarButtonItem.swift
+++ b/Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift
@@ -1,7 +1,7 @@
 //
-//  IQBarButtonItem.swift
+//  IQUIViewController+Additions.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -21,21 +21,26 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-
+import Foundation
 import UIKit
 
-class IQBarButtonItem: UIBarButtonItem {
-   
-    override class func initialize() {
 
-        superclass()?.initialize()
-        
-        self.appearance().tintColor = nil
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Normal)
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Highlighted)
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Disabled)
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Selected)
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Application)
-        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Reserved)
+private var kIQLayoutGuideConstraint = "kIQLayoutGuideConstraint"
+
+
+public extension UIViewController {
+
+    /**
+    To set customized distance from keyboard for textField/textView. Can't be less than zero
+    */
+    @IBOutlet public var IQLayoutGuideConstraint: NSLayoutConstraint? {
+        get {
+            
+            return objc_getAssociatedObject(self, &kIQLayoutGuideConstraint) as? NSLayoutConstraint
+        }
+
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQLayoutGuideConstraint, newValue,objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Clutch/IQKeybordManagerSwift/IQToolbar/IQToolbar.swift b/Clutch/IQKeybordManagerSwift/IQToolbar/IQToolbar.swift
deleted file mode 100644
index f601647..0000000
--- a/Clutch/IQKeybordManagerSwift/IQToolbar/IQToolbar.swift
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-//  IQToolbar.swift
-// https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-import UIKit
-
-/** @abstract   IQToolbar for IQKeyboardManager.    */
-class IQToolbar: UIToolbar , UIInputViewAudioFeedback {
-
-    var titleFont : UIFont? {
-        
-        didSet {
-            
-            if items != nil {
-                for item in items as! [UIBarButtonItem] {
-                    
-                    if item is IQTitleBarButtonItem == true {
-                        (item as! IQTitleBarButtonItem).font = titleFont
-                    }
-                }
-            }
-        }
-    }
-    
-    var title : String? {
-        
-        didSet {
-            
-            if items != nil {
-                for item in items as! [UIBarButtonItem] {
-                    
-                    if item is IQTitleBarButtonItem == true {
-                        (item as! IQTitleBarButtonItem).title = title
-                    }
-                }
-            }
-        }
-    }
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        
-        sizeToFit()
-        autoresizingMask = UIViewAutoresizing.FlexibleWidth
-        
-        tintColor = UIColor .blackColor()
-    }
-    
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-
-        sizeToFit()
-        autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight
-        
-        tintColor = UIColor .blackColor()
-    }
-
-    override func sizeThatFits(size: CGSize) -> CGSize {
-        var sizeThatFit = super.sizeThatFits(size)
-        sizeThatFit.height = 44
-        return sizeThatFit
-    }
-
-    override var tintColor: UIColor! {
-        
-        didSet {
-            if items != nil {
-                for item in items as! [UIBarButtonItem] {
-                    
-                    if item is IQTitleBarButtonItem {
-                        (item as! IQTitleBarButtonItem).tintColor = tintColor
-                    }
-                }
-            }
-        }
-    }
-    
-    var enableInputClicksWhenVisible: Bool {
-        return true
-    }
-}
diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png b/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png
deleted file mode 100644
index c4a81c449abea0ccae5dc72223d34be37aada6a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^;y|p$!3HEF&K<Z6q&N#aB8wRq#8g3;(KATp15i*V
z)5SjoNHYO32#5l)29yS|m$=LAx(TEUJY5_^Jb0557U(4~NnK|?GV6-zv_{614>k(_
z_>br}%*YZ`kmfOxX^C!}k<@VZL8e2nq^4=*m4ph8KDMI<++8cToKjfK*6eK-@X~BY
zbCcwYL#+-x+TAOkB~3W!otbEG!KY2nq<K5@PZ9Ai3eAi_EC2s@I$16UWQ2k2PEJTj
zn85mIx5FR#u6o9o0t(Bd7VKm-a#((kF=^J%gey!<orxwLZp|GD90DN*v$~+HhB;mT
w7(>$qt~f4Yn!vif(PFYot&8^amX$0FZk9_fYr04L0ouUe>FVdQ&MBb@0O<Z`TmS$7

diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png b/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png
deleted file mode 100644
index 3ec68e2989838c2b25c35e149da21d72913aa9be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^;y|p$!3HEF&K<Z6q&N#aB8wRq#8g3;(KATp15i*V
z)5SjoNHYO32#5l)29yS|=SoN$T?EpZo-U3d9=u5j4GgIYSJ{u839!4WG2vi;;}3fQ
zea56!Q5RTEB~mP|>LxHrS(RU5O5k|Fa@e?I8q;6zttnl)9d5b~o`H)UTZCk8SO6*A
zkbol_ST7na;F|U9$<r&_5`-@}MC7t9QU|%?|NqBx*Zcx9N<fyroodb1U?9MHxvD#N
z&+#fz+Z~MO6IT0)wH`H_ohR>OcUB;dNmEs=>sib1rwQ{GT6Z1n*8ZKC<akf^=m-0a
zCDDQ!OK!|MqqU~ZjAwO{qurC8OLyFzt-AWhtPPc^dlvjv5@m7PoOs*OX|12x&e9W~
Z81MBiIetOJjR$BygQu&X%Q~loCIBYudH4VT

diff --git a/Clutch/Networking.swift b/Clutch/Networking.swift
index 2d497ec..9a750a4 100644
--- a/Clutch/Networking.swift
+++ b/Clutch/Networking.swift
@@ -53,7 +53,7 @@ public class Networking {
     {
         let date = NSDate()
         
-        var formatter = NSDateFormatter();
+        let formatter = NSDateFormatter();
         formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'";
         formatter.timeZone = NSTimeZone(abbreviation: "UTC");
         let utcTimeZoneStr = formatter.stringFromDate(date);
@@ -67,7 +67,7 @@ public class Networking {
     public func helperGetTransactionId(host: String, success: (String) -> (), failure: (NSError) -> ()) -> () {
         var reqId = getRequestId() // requestId not validated for this call
 
-            manager.request(.GET, "\(host)/mobile-key").responseJSON{(request, response, data, error) in
+            manager.request(.GET, "\(host)/mobile-key").responseJSON{request, response, data, error in
             if let errorMessage = error {
                 println("Networking.helperGetTransactionId most likely received malformed data from server.")
                 failure(errorMessage)
@@ -110,7 +110,7 @@ public class Networking {
     public func tokenize(transactionId: String, expiryMonth: String, expiryYear: String, cvc: String, pan: String, certificateBase64Der: String, success: (String) -> (), failure: (NSError) -> ()) -> () {
     
         let jsonCardData = JSON(["expiry_month": expiryMonth, "expiry_year": expiryYear, "cvc" : cvc, "pan" : pan])
-        if let encrypted = encryptWithRsaAes(jsonCardData.description, certificateBase64Der)
+        if let encrypted = encryptWithRsaAes(jsonCardData.description, certificateBase64Der: certificateBase64Der)
         {
             let payloadJson = ["encrypted" : encrypted.encryptedBase64Message, "key" : ["key" : encrypted.encryptedBase64Key, "iv" : encrypted.iv]]
             
@@ -173,7 +173,7 @@ public class Networking {
         {
             return true
         }
-        println("Error: received requestID did not match.")
+        print("Error: received requestID did not match.")
         return false
     }
 }
diff --git a/Clutch/SPHAddCardViewController.swift b/Clutch/SPHAddCardViewController.swift
index 0736ba9..fda29f1 100644
--- a/Clutch/SPHAddCardViewController.swift
+++ b/Clutch/SPHAddCardViewController.swift
@@ -24,8 +24,8 @@ import UIKit
     @IBOutlet weak var scrollContainer: UIScrollView!
 
     internal var transactionId = ""
-    internal var successHandler : (String) -> () = {println($0)}
-    internal var errorHandler : (NSError) -> () = {println($0)}
+    internal var successHandler : (String) -> () = {print($0)}
+    internal var errorHandler : (NSError) -> () = {print($0)}
     
     let correctBorderColor = UIColor(hexInt: 0xa6b9dc).CGColor
 
@@ -37,7 +37,7 @@ import UIKit
     
     func presentationController(controller: UIPresentationController, viewControllerForAdaptivePresentationStyle style: UIModalPresentationStyle) -> UIViewController? {
         // Override default behavior for popover on small screens
-        println(controller.presentedViewController)
+        print(controller.presentedViewController)
         let navcon = controller.presentedViewController as! UINavigationController
         let visualEffectView = UIVisualEffectView(effect: UIBlurEffect(style: UIBlurEffectStyle.Light))
         visualEffectView.frame = navcon.view.bounds
@@ -71,13 +71,13 @@ import UIKit
             switch field {
             case cardNumberField:
                 iconImage = UIImage(named: "cardicon", inBundle: clutchBundle, compatibleWithTraitCollection: nil)
-                field.addTarget(self, action: "formatCardNumberFieldOnTheFly:", forControlEvents: UIControlEvents.EditingChanged)
+                field.addTarget(self, action: #selector(SPHAddCardViewController.formatCardNumberFieldOnTheFly(_:)), forControlEvents: UIControlEvents.EditingChanged)
             case cardExpiryDateField:
                 iconImage = UIImage(named: "calendaricon", inBundle: clutchBundle, compatibleWithTraitCollection: nil)
-                field.addTarget(self, action: "formatExpirationDateFieldOnTheFly:", forControlEvents: UIControlEvents.EditingChanged)
+                field.addTarget(self, action: #selector(SPHAddCardViewController.formatExpirationDateFieldOnTheFly(_:)), forControlEvents: UIControlEvents.EditingChanged)
             case cardSecurityCodeField:
                 iconImage = UIImage(named: "lockicon", inBundle: clutchBundle, compatibleWithTraitCollection: nil)
-                field.addTarget(self, action: "formatSecurityCodeFieldOnTheFly:", forControlEvents: UIControlEvents.EditingChanged)
+                field.addTarget(self, action: #selector(SPHAddCardViewController.formatSecurityCodeFieldOnTheFly(_:)), forControlEvents: UIControlEvents.EditingChanged)
             default: break
             }
     
@@ -97,12 +97,12 @@ import UIKit
         
         addCardButton.layer.cornerRadius = 4.0
         addCardButton.layer.masksToBounds = true
-        addCardButton.addTarget(self, action: "addCardButtonTapped:", forControlEvents: .TouchUpInside)
+        addCardButton.addTarget(self, action: #selector(SPHAddCardViewController.addCardButtonTapped(_:)), forControlEvents: .TouchUpInside)
         addCardButton.layer.insertSublayer(gradientLayer, atIndex: 0)
         
         // Setup cancel
         
-        navCancel.addTarget(self, action: "navCancelButtonTapped:",
+        navCancel.addTarget(self, action: #selector(SPHAddCardViewController.navCancelButtonTapped(_:)),
             forControlEvents: .TouchUpInside)
         
         setupLocalization()
@@ -121,7 +121,7 @@ import UIKit
     
     func formatCardNumberFieldOnTheFly(textView: AnyObject){
         if let sphField = textView as? SPHClutchTextField{
-            sphField.text = SPHClutch.sharedInstance.formattedCardNumber(sphField.text, cardType: SPHClutch.sharedInstance.cardTypeForCardNumber(SPHClutch.sharedInstance.formattedCardNumberForProcessing(sphField.text)))
+            sphField.text = SPHClutch.sharedInstance.formattedCardNumber(sphField.text!, cardType: SPHClutch.sharedInstance.cardTypeForCardNumber(SPHClutch.sharedInstance.formattedCardNumberForProcessing(sphField.text!)))
             
             updateCardNumberValidity(sphField)
         }
@@ -129,7 +129,7 @@ import UIKit
     
     func formatExpirationDateFieldOnTheFly(textView: AnyObject){
         if let sphField = textView as? SPHClutchTextField{
-            sphField.text = SPHClutch.sharedInstance.formattedExpirationDate(sphField.text)
+            sphField.text = SPHClutch.sharedInstance.formattedExpirationDate(sphField.text!)
             
             updateExpirationValidity(sphField)
         }
@@ -138,7 +138,7 @@ import UIKit
     
     func formatSecurityCodeFieldOnTheFly(textView: AnyObject){
         if let sphField = textView as? SPHClutchTextField{
-            sphField.text = SPHClutch.sharedInstance.formattedSecurityCode(sphField.text)
+            sphField.text = SPHClutch.sharedInstance.formattedSecurityCode(sphField.text!)
             
             updateSecurityCodeValidity(sphField)
         }
@@ -174,7 +174,7 @@ import UIKit
     }
     
     func genericUpdateCodeValidity(sphField: SPHClutchTextField, validityFunction: (String) -> Bool){
-        if validityFunction(sphField.text) == true {
+        if validityFunction(sphField.text!) == true {
             sphField.fieldState = SPHClutchTextFieldState.Valid
         } else {
             sphField.fieldState = SPHClutchTextFieldState.Invalid
@@ -199,7 +199,7 @@ import UIKit
     }
     
     func addCardButtonTapped(sender: AnyObject) {
-        if let gradient = self.addCardButton.layer.sublayers.first as? CAGradientLayer {
+        if let gradient = self.addCardButton.layer.sublayers!.first as? CAGradientLayer {
             UIView.animateWithDuration(0.25, delay: 0.0, options: .BeginFromCurrentState,
                 animations: {
                     gradient.colors = [UIColor(hexInt: 0x3c89cf).CGColor, UIColor(hexInt: 0x4f9ee5).CGColor]
@@ -218,10 +218,10 @@ import UIKit
             return
         } else {
         
-        let month = cardExpiryDateField.text.componentsSeparatedByString("/")[0]
-        let year = "20" + cardExpiryDateField.text.componentsSeparatedByString("/")[1]
+        let month = cardExpiryDateField.text!.componentsSeparatedByString("/")[0]
+        let year = "20" + cardExpiryDateField.text!.componentsSeparatedByString("/")[1]
         
-        SPHClutch.sharedInstance.addCard(transactionId, pan: SPHClutch.sharedInstance.formattedCardNumberForProcessing(cardNumberField.text), cvc: cardSecurityCodeField.text, expiryMonth: month, expiryYear: year, success: successHandler, failure: errorHandler)
+        SPHClutch.sharedInstance.addCard(transactionId, pan: SPHClutch.sharedInstance.formattedCardNumberForProcessing(cardNumberField.text!), cvc: cardSecurityCodeField.text!, expiryMonth: month, expiryYear: year, success: successHandler, failure: errorHandler)
         }
         
         self.dismissViewControllerAnimated(true, completion: nil)
diff --git a/Clutch/SPHClutch.storyboard b/Clutch/SPHClutch.storyboard
index d5ce9d4..fd40bf8 100644
--- a/Clutch/SPHClutch.storyboard
+++ b/Clutch/SPHClutch.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -177,7 +178,7 @@
                     <navigationItem key="navigationItem" id="lLE-Of-S0i">
                         <barButtonItem key="leftBarButtonItem" style="plain" id="kNB-hb-ZRb">
                             <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="0ta-PE-gVO">
-                                <rect key="frame" x="-23" y="-15" width="133" height="30"/>
+                                <rect key="frame" x="20" y="7" width="133" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Cancel">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Clutch/SPHClutch.swift b/Clutch/SPHClutch.swift
index f89c455..58d31fc 100644
--- a/Clutch/SPHClutch.swift
+++ b/Clutch/SPHClutch.swift
@@ -17,7 +17,7 @@ public struct ClutchDomains {
 }
 
 /// The recognized card types in the system
-public enum SPHClutchCardType: Int, Printable {
+public enum SPHClutchCardType: Int, CustomStringConvertible {
 	case Visa = 0
 	case MasterCard
 	case AmericanExpress
@@ -111,17 +111,17 @@ public class SPHClutch {
 	
 	/// Formats a card number for processing purposes
     ///
-	/// :param:   cardNumber The card number to format
-	/// :returns: The formatted card number, or an empty string
+	/// - parameter   cardNumber: The card number to format
+	/// - returns: The formatted card number, or an empty string
 	public func formattedCardNumberForProcessing(cardNumber: String) -> String {
 		let illegal    = NSCharacterSet.decimalDigitCharacterSet().invertedSet
 		let components = cardNumber.componentsSeparatedByCharactersInSet(illegal)
-		return join("", components)
+		return components.joinWithSeparator("")
 	}
 	
 	/// Recognize the type of a credit card number
     ///
-	/// :param: cardNumber The card number string
+	/// - parameter cardNumber: The card number string
 	public func cardTypeForCardNumber(cardNumber: String) -> SPHClutchCardType {
 		let valid = self.isValidCardNumber(cardNumber)
 		if !valid {
@@ -129,7 +129,7 @@ public class SPHClutch {
 		}
 		
 		let formattedString: String = self.formattedCardNumberForProcessing(cardNumber)
-		if count(formattedString) < 9 {
+		if formattedString.characters.count < 9 {
 			return .Invalid
 		}
 		
@@ -147,16 +147,16 @@ public class SPHClutch {
 	
 	/// Validate a given credit card number using the Luhn algorithm
     ///
-	/// :param:   cardNumber The card number to validate
-	/// :returns: true if the number passes, false if not
+	/// - parameter   cardNumber: The card number to validate
+	/// - returns: true if the number passes, false if not
 	public func isValidCardNumber(cardNumber: String) -> Bool {
 		let formattedString = self.formattedCardNumberForProcessing(cardNumber)
-		if count(formattedString) < 9 {
+		if formattedString.characters.count < 9 {
 			return false
 		}
         
 		let asciiOffset: UInt8 = 48
-		let digits = Array(formattedString.utf8).reverse().map{$0 - asciiOffset}
+		let digits = Array(Array(formattedString.utf8).reverse()).map{$0 - asciiOffset}
 		
 		let convert: (UInt8) -> (UInt8) = {
 			let n = $0 * 2
@@ -164,7 +164,7 @@ public class SPHClutch {
 		}
 		
 		var sum: UInt8 = 0
-		for (index, digit) in enumerate(digits) {
+		for (index, digit) in digits.enumerate() {
 			if index & 1 == 1 {
 				sum += convert(digit)
 			} else {
@@ -177,9 +177,9 @@ public class SPHClutch {
 	
 	/// Format a given card number to a neat string
     ///
-	/// :param:   cardNumber The card number to format
-	/// :param:   cardType   The type of the card number
-	/// :returns: The properly spaced credit card number
+	/// - parameter   cardNumber: The card number to format
+	/// - parameter   cardType:   The type of the card number
+	/// - returns: The properly spaced credit card number
 	public func formattedCardNumber(cardNumber: String, cardType: SPHClutchCardType) -> String {
         let formattedString = self.formattedCardNumberForProcessing(cardNumber).truncate(19, trailing: "")
         
@@ -190,25 +190,25 @@ public class SPHClutch {
 		}
 		
 		// Create and check regexp matches
-		let regexp  = NSRegularExpression(pattern: regexpString, options: nil, error: nil)!
+		let regexp  = try! NSRegularExpression(pattern: regexpString, options: [])
 		var groups  = [String]()
         
         let matches = formattedString.matchesForRegex(regexpString)
 		
 		// Glue them together
-		return join(" ", matches)
+		return matches.joinWithSeparator(" ")
 	}
     
     // MARK: expiration date 
     
     public func isValidExpirationDate(expirationDate: String) -> Bool {
         
-        if(count(expirationDate) == 5)
+        if(expirationDate.characters.count == 5)
         {
             let month = expirationDate.componentsSeparatedByString("/")[0]
             let year = "20" + expirationDate.componentsSeparatedByString("/")[1]
          
-            var dateFormatter = NSDateFormatter()
+            let dateFormatter = NSDateFormatter()
             dateFormatter.dateFormat = "MMyyyy"
             
             let currentDate = dateFormatter.stringFromDate(NSDate())
@@ -229,13 +229,13 @@ public class SPHClutch {
     
     public func formattedExpirationDate(expirationDate: String) -> String {
         var onlyDigitsExpirationDate = formattedExpirationDateForProcessing(expirationDate)
-        let length = count(onlyDigitsExpirationDate)
+        let length = onlyDigitsExpirationDate.characters.count
         
         var text = ""
         
         switch length {
         case 1:
-            if(2...9 ~= onlyDigitsExpirationDate.toInt()!)
+            if(2...9 ~= Int(onlyDigitsExpirationDate)!)
             {
                 text = "0\(onlyDigitsExpirationDate)/"
             } else {
@@ -246,7 +246,7 @@ public class SPHClutch {
             {
                 text = onlyDigitsExpirationDate
             } else {
-                if onlyDigitsExpirationDate.toInt()! < 1 || onlyDigitsExpirationDate.toInt()! > 12
+                if Int(onlyDigitsExpirationDate)! < 1 || Int(onlyDigitsExpirationDate)! > 12
                 {
                     onlyDigitsExpirationDate.removeAtIndex(onlyDigitsExpirationDate.endIndex.predecessor())
                     text = onlyDigitsExpirationDate
@@ -255,26 +255,26 @@ public class SPHClutch {
                 }
             }
         case 3:
-            onlyDigitsExpirationDate.insert("/", atIndex: advance(onlyDigitsExpirationDate.startIndex, 2))
+            onlyDigitsExpirationDate.insert("/", atIndex: onlyDigitsExpirationDate.startIndex.advancedBy(2))
             text = onlyDigitsExpirationDate
         case 4:
-            onlyDigitsExpirationDate.insert("/", atIndex: advance(onlyDigitsExpirationDate.startIndex, 2))
+            onlyDigitsExpirationDate.insert("/", atIndex: onlyDigitsExpirationDate.startIndex.advancedBy(2))
             text = onlyDigitsExpirationDate
         case 5:
             onlyDigitsExpirationDate.removeAtIndex(onlyDigitsExpirationDate.endIndex.predecessor())
-            onlyDigitsExpirationDate.insert("/", atIndex: advance(onlyDigitsExpirationDate.startIndex, 2))
+            onlyDigitsExpirationDate.insert("/", atIndex: onlyDigitsExpirationDate.startIndex.advancedBy(2))
             text = onlyDigitsExpirationDate
         default:
             text = ""
         }
         
-        lastExpirationDateLength = count(text)
+        lastExpirationDateLength = text.characters.count
         
         return text
     }
     
     public func isValidSecurityCode(securityCode: String) -> Bool {
-        return count(self.formattedSecurityCodeForProcessing(securityCode)) > 0
+        return self.formattedSecurityCodeForProcessing(securityCode).characters.count > 0
     }
     
     public func formattedSecurityCodeForProcessing(securityCode: String) -> String {
@@ -284,7 +284,7 @@ public class SPHClutch {
     public func formattedSecurityCode(securityCode: String) -> String {
         var onlyDigitsSecurityCode = formattedSecurityCodeForProcessing(securityCode)
         var text = ""
-        switch count(onlyDigitsSecurityCode)
+        switch onlyDigitsSecurityCode.characters.count
         {
             case 0...4 : text = onlyDigitsSecurityCode
             case 5 :
diff --git a/Clutch/SPHClutchFormLabel.swift b/Clutch/SPHClutchFormLabel.swift
index cb7f477..801f17b 100644
--- a/Clutch/SPHClutchFormLabel.swift
+++ b/Clutch/SPHClutchFormLabel.swift
@@ -14,7 +14,7 @@ public class SPHClutchFormLabel: UILabel {
 		super.init(frame: frame)
 	}
 	
-	required public init(coder aDecoder: NSCoder) {
+	required public init?(coder aDecoder: NSCoder) {
 		super.init(coder: aDecoder)
 	}
 	
diff --git a/Clutch/SPHClutchFormatter.swift b/Clutch/SPHClutchFormatter.swift
index a8182d9..f532624 100644
--- a/Clutch/SPHClutchFormatter.swift
+++ b/Clutch/SPHClutchFormatter.swift
@@ -52,10 +52,10 @@ public class TextPattern {
 	
 	/// Move to the next character index and process it
 	public func next() -> Bool {
-		index++
-		if index >= count(text) { return true }
+		index += 1
+		if index >= text.characters.count { return true }
 		
-		current = text[advance(text.startIndex, index)]
+		current = text[text.startIndex.advancedBy(index)]
 		if current == "?" {
 			next()
 			mustFullfill = false
@@ -69,7 +69,7 @@ public class TextPattern {
 	public func rewind() -> Bool {
 		if index > rewindIndex && rewindIndex > 0 {
 			index = rewindIndex
-			current = text[advance(text.startIndex, rewindIndex)]
+			current = text[text.startIndex.advancedBy(rewindIndex)]
 			return true
 		}
 		
@@ -121,10 +121,10 @@ public class SPHClutchFormatter {
 		var collect = Array<TextPattern>()
 		var index = 0
 		var text = source
-		for char in text {
+		for char in text.characters {
 			var consumed = false
 			var lastChar: Character?
-			for pattern in pending.reverse() {
+			for pattern in Array(pending.reverse()) {
 				if char != pattern.current && pattern.mustFullfill {
 					pending = pending.filter{$0 != pattern}
 				} else if char == pattern.current {
@@ -133,15 +133,15 @@ public class SPHClutchFormatter {
 						continue //it is matching on the same pattern, so skip it
 					}
 					if pattern.next() {
-						let range = advance(text.startIndex, pattern.start)...advance(text.startIndex, index)
+						let range = text.startIndex.advancedBy(pattern.start)...text.startIndex.advancedBy(index)
 						//println("text range: \(text[range])")
 						if let match = pattern.matched {
 							let src = text[range]
-							let srcLen = count(src)
+							let srcLen = src.characters.count
 							var replace = match(src,text,pattern.start)
 							if replace.attributes != nil {
 								text.replaceRange(range, with: replace.text)
-								let replaceLen = count(replace.text)
+								let replaceLen = replace.count
 								index -= (srcLen-replaceLen)
 								lastChar = char
 								pattern.length = replaceLen
@@ -168,7 +168,7 @@ public class SPHClutchFormatter {
 					}
 				}
 			}
-			index++
+			index += 1
 		}
 		//we have our patterns, let's build a stylized string
 		var attributedText = NSMutableAttributedString(string: text)
diff --git a/Clutch/SPHClutchTextField.swift b/Clutch/SPHClutchTextField.swift
index 8e0a0a2..283e57f 100644
--- a/Clutch/SPHClutchTextField.swift
+++ b/Clutch/SPHClutchTextField.swift
@@ -41,7 +41,7 @@ public class SPHClutchTextField: UITextField {
 		super.init(frame: frame)
 	}
 	
-	public required init(coder aDecoder: NSCoder) {
+	public required init?(coder aDecoder: NSCoder) {
 		super.init(coder: aDecoder)
         
 	}
@@ -66,7 +66,7 @@ public class SPHClutchCreditCardTextField: SPHClutchTextField {
         
     }
     
-    public required init(coder aDecoder: NSCoder) {
+    public required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
     
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQNSArray+Sort.swift b/IQKeyboardManagerSwift/Categories/IQNSArray+Sort.swift
old mode 100644
new mode 100755
similarity index 66%
rename from Clutch/IQKeybordManagerSwift/Categories/IQNSArray+Sort.swift
rename to IQKeyboardManagerSwift/Categories/IQNSArray+Sort.swift
index 6989b6b..7a58133
--- a/Clutch/IQKeybordManagerSwift/Categories/IQNSArray+Sort.swift
+++ b/IQKeyboardManagerSwift/Categories/IQNSArray+Sort.swift
@@ -1,7 +1,7 @@
 //
 //  IQNSArray+Sort.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ import UIKit
 /**
 UIView.subviews sorting category.
 */
-extension NSArray {
+internal extension Array {
     
     ///--------------
     /// MARK: Sorting
@@ -36,29 +36,23 @@ extension NSArray {
     /**
     Returns the array by sorting the UIView's by their tag property.
     */
-    func sortedArrayByTag() -> NSArray {
+    internal func sortedArrayByTag() -> [Element] {
         
-        return sortedArrayUsingComparator({ (let obj1: AnyObject?, let obj2: AnyObject?) -> NSComparisonResult in
+        return sort({ (obj1 : Element, obj2 : Element) -> Bool in
             
             let view1 = obj1 as! UIView
             let view2 = obj2 as! UIView
             
-            if view1.tag < view2.tag {
-                return .OrderedAscending
-            } else if view1.tag > view2.tag {
-                return .OrderedDescending
-            } else {
-                return .OrderedSame
-            }
+            return (view1.tag < view2.tag)
         })
     }
     
     /**
     Returns the array by sorting the UIView's by their tag property.
     */
-    func sortedArrayByPosition() -> NSArray {
+    internal func sortedArrayByPosition() -> [Element] {
         
-        return sortedArrayUsingComparator({ (let obj1: AnyObject?, let obj2: AnyObject?) -> NSComparisonResult in
+        return sort({ (obj1 : Element, obj2 : Element) -> Bool in
             
             let view1 = obj1 as! UIView
             let view2 = obj2 as! UIView
@@ -68,17 +62,10 @@ extension NSArray {
             let x2 = CGRectGetMinX(view2.frame)
             let y2 = CGRectGetMinY(view2.frame)
             
-            if y1 < y2 {
-                return .OrderedAscending
-            } else if y1 > y2 {
-                return .OrderedDescending
-            } else if x1 < x2 {    //Else both y are same so checking for x positions
-                
-                return .OrderedAscending
-            } else if x1 > x2 {
-                return .OrderedDescending
+            if y1 != y2 {
+                return y1 < y2
             } else {
-                return .OrderedSame
+                return x1 < x2
             }
         })
     }
diff --git a/IQKeyboardManagerSwift/Categories/IQUIScrollView+Additions.swift b/IQKeyboardManagerSwift/Categories/IQUIScrollView+Additions.swift
new file mode 100755
index 0000000..53f2bcf
--- /dev/null
+++ b/IQKeyboardManagerSwift/Categories/IQUIScrollView+Additions.swift
@@ -0,0 +1,47 @@
+//
+//  IQUIScrollView+Additions.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+import UIKit
+
+private var kIQShouldRestoreScrollViewContentOffset = "kIQShouldRestoreScrollViewContentOffset"
+
+public extension UIScrollView {
+    
+    /**
+     To set customized distance from keyboard for textField/textView. Can't be less than zero
+     */
+    public var shouldRestoreScrollViewContentOffset: Bool {
+        get {
+            
+            if let aValue = objc_getAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset) as? Bool {
+                return aValue
+            } else {
+                return false
+            }
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
diff --git a/IQKeyboardManagerSwift/Categories/IQUITextFieldView+Additions.swift b/IQKeyboardManagerSwift/Categories/IQUITextFieldView+Additions.swift
new file mode 100755
index 0000000..9cc0f3e
--- /dev/null
+++ b/IQKeyboardManagerSwift/Categories/IQUITextFieldView+Additions.swift
@@ -0,0 +1,56 @@
+//
+//  IQUITextFieldView+Additions.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+import UIKit
+
+/**
+Uses default keyboard distance for textField.
+*/
+public let kIQUseDefaultKeyboardDistance = CGFloat.max
+
+private var kIQKeyboardDistanceFromTextField = "kIQKeyboardDistanceFromTextField"
+
+/**
+UIView category for managing UITextField/UITextView
+*/
+public extension UIView {
+
+    /**
+    To set customized distance from keyboard for textField/textView. Can't be less than zero
+    */
+    public var keyboardDistanceFromTextField: CGFloat {
+        get {
+            
+            if let aValue = objc_getAssociatedObject(self, &kIQKeyboardDistanceFromTextField) as? CGFloat {
+                return aValue
+            } else {
+                return kIQUseDefaultKeyboardDistance
+            }
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQKeyboardDistanceFromTextField, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
+
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUIView+Hierarchy.swift b/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
old mode 100644
new mode 100755
similarity index 77%
rename from Clutch/IQKeybordManagerSwift/Categories/IQUIView+Hierarchy.swift
rename to IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
index 4e8922b..3a9c1c8
--- a/Clutch/IQKeybordManagerSwift/Categories/IQUIView+Hierarchy.swift
+++ b/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
@@ -1,7 +1,7 @@
 //
 //  IQUIView+Hierarchy.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,12 @@
 import Foundation
 import UIKit
 
+private var kIQIsAskingCanBecomeFirstResponder = "kIQIsAskingCanBecomeFirstResponder"
+
 /**
 UIView hierarchy category.
 */
-extension UIView {
+public extension UIView {
     
     ///------------------------------
     /// MARK: canBecomeFirstResponder
@@ -37,17 +39,17 @@ extension UIView {
     /**
     Returns YES if IQKeyboardManager asking for `canBecomeFirstResponder. Useful when doing custom work in `textFieldShouldBeginEditing:` delegate.
     */
-    var isAskingCanBecomeFirstResponder: Bool {
+    public var isAskingCanBecomeFirstResponder: Bool {
         get {
             
-            if let aValue = objc_getAssociatedObject(self, "isAskingCanBecomeFirstResponder") as? Bool {
+            if let aValue = objc_getAssociatedObject(self, &kIQIsAskingCanBecomeFirstResponder) as? Bool {
                 return aValue
             } else {
                 return false
             }
         }
         set(newValue) {
-            objc_setAssociatedObject(self, "isAskingCanBecomeFirstResponder", newValue, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+            objc_setAssociatedObject(self, &kIQIsAskingCanBecomeFirstResponder, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
         }
     }
 
@@ -58,15 +60,15 @@ extension UIView {
     /**
     Returns the UIViewController object that manages the receiver.
     */
-    func viewController()->UIViewController? {
+    public func viewController()->UIViewController? {
         
         var nextResponder: UIResponder? = self
         
-        do {
-            nextResponder = nextResponder?.nextResponder()!
+        repeat {
+            nextResponder = nextResponder?.nextResponder()
             
-            if nextResponder is UIViewController {
-                return nextResponder as? UIViewController
+            if let viewController = nextResponder as? UIViewController {
+                return viewController
             }
             
         } while nextResponder != nil
@@ -77,7 +79,7 @@ extension UIView {
     /**
     Returns the topMost UIViewController object in hierarchy.
     */
-    func topMostController()->UIViewController? {
+    public func topMostController()->UIViewController? {
         
         var controllersHierarchy = [UIViewController]()
 
@@ -93,9 +95,9 @@ extension UIView {
             
             var matchController :UIResponder? = viewController()
 
-            while matchController != nil && contains(controllersHierarchy, matchController as! UIViewController) == false {
+            while matchController != nil && controllersHierarchy.contains(matchController as! UIViewController) == false {
                 
-                do {
+                repeat {
                     matchController = matchController?.nextResponder()
 
                 } while matchController != nil && matchController is UIViewController == false
@@ -116,7 +118,7 @@ extension UIView {
     /**
     Returns the superView of provided class type.
     */
-    func superviewOfClassType(classType:AnyClass)->UIView? {
+    public func superviewOfClassType(classType:AnyClass)->UIView? {
 
         struct InternalClass {
             
@@ -130,9 +132,9 @@ extension UIView {
         while let unwrappedSuperView = superView {
             
             if unwrappedSuperView.isKindOfClass(classType) &&
-                ((InternalClass.UITableViewCellScrollViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UITableViewCellScrollViewClass!) == false) ||
-                    (InternalClass.UITableViewWrapperViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UITableViewWrapperViewClass!) == false) ||
-                    (InternalClass.UIQueuingScrollViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UIQueuingScrollViewClass!) == false)) {
+                ((InternalClass.UITableViewCellScrollViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UITableViewCellScrollViewClass!) == false) &&
+                    (InternalClass.UITableViewWrapperViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UITableViewWrapperViewClass!) == false) &&
+                    (InternalClass.UIQueuingScrollViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UIQueuingScrollViewClass!) == false)) {
                         return superView
             } else {
                 
@@ -146,32 +148,33 @@ extension UIView {
     /**
     Returns all siblings of the receiver which canBecomeFirstResponder.
     */
-    func responderSiblings()->NSArray {
-        
-        //	Getting all siblings
-        let siblings = superview?.subviews
-        
+    public func responderSiblings()->[UIView] {
+
         //Array of (UITextField/UITextView's).
         var tempTextFields = [UIView]()
-        
-        for textField in siblings as! [UIView] {
+
+        //	Getting all siblings
+        if let siblings = superview?.subviews {
             
-            if textField._IQcanBecomeFirstResponder() == true {
-                tempTextFields.append(textField)
+            for textField in siblings {
+                
+                if textField._IQcanBecomeFirstResponder() == true {
+                    tempTextFields.append(textField)
+                }
             }
         }
-        
+
         return tempTextFields
     }
     
     /**
     Returns all deep subViews of the receiver which canBecomeFirstResponder.
     */
-    func deepResponderViews()->NSArray {
+    public func deepResponderViews()->[UIView] {
         
         //subviews are returning in opposite order. So I sorted it according the frames 'y'.
         
-        let subViews = (subviews as NSArray).sortedArrayUsingComparator { (let obj1: AnyObject!, let obj2: AnyObject!) -> NSComparisonResult in
+        let subViews = subviews.sort({ (obj1 : AnyObject, obj2 : AnyObject) -> Bool in
             
             let view1 = obj1 as! UIView
             let view2 = obj2 as! UIView
@@ -180,30 +183,23 @@ extension UIView {
             let y1 = CGRectGetMinY(view1.frame)
             let x2 = CGRectGetMinX(view2.frame)
             let y2 = CGRectGetMinY(view2.frame)
-
-            if y1 < y2 {
-                return .OrderedAscending
-            } else if y1 > y2 {
-                return .OrderedDescending
-            } else if x1 < x2 {    //Else both y are same so checking for x positions
-
-                return .OrderedAscending
-            } else if x1 > x2 {
-                return .OrderedDescending
+            
+            if y1 != y2 {
+                return y1 < y2
             } else {
-                return .OrderedSame
+                return x1 < x2
             }
-        }
-        
+        })
+
         //Array of (UITextField/UITextView's).
         var textfields = [UIView]()
         
-        for textField in subViews as! [UIView] {
+        for textField in subViews {
             
             if textField._IQcanBecomeFirstResponder() == true {
                 textfields.append(textField)
             } else if textField.subviews.count != 0 {
-                for deepView in textField.deepResponderViews() as! [UIView] {
+                for deepView in textField.deepResponderViews() {
                     textfields.append(deepView)
                 }
             }
@@ -218,18 +214,19 @@ extension UIView {
         
         var _IQcanBecomeFirstResponder = (canBecomeFirstResponder() == true && userInteractionEnabled == true && hidden == false && alpha != 0.0 && isAlertViewTextField() == false && isSearchBarTextField() == false) as Bool
 
-        //  Setting toolbar to keyboard.
-        if let textField = self as? UITextField {
-            _IQcanBecomeFirstResponder = textField.enabled
-        } else if let textView = self as? UITextView {
-            _IQcanBecomeFirstResponder = textView.editable
+        if _IQcanBecomeFirstResponder == true {
+            //  Setting toolbar to keyboard.
+            if let textField = self as? UITextField {
+                _IQcanBecomeFirstResponder = textField.enabled
+            } else if let textView = self as? UITextView {
+                _IQcanBecomeFirstResponder = textView.editable
+            }
         }
 
         isAskingCanBecomeFirstResponder = false
 
         return _IQcanBecomeFirstResponder
     }
-    
 
     ///-------------------------
     /// MARK: Special TextFields
@@ -238,7 +235,7 @@ extension UIView {
     /**
     Returns YES if the receiver object is UISearchBarTextField, otherwise return NO.
     */
-    func isSearchBarTextField()-> Bool {
+    public func isSearchBarTextField()-> Bool {
         
         struct InternalClass {
             
@@ -251,7 +248,7 @@ extension UIView {
     /**
     Returns YES if the receiver object is UIAlertSheetTextField, otherwise return NO.
     */
-    func isAlertViewTextField()->Bool {
+    public func isAlertViewTextField()->Bool {
         
         struct InternalClass {
             
@@ -271,7 +268,7 @@ extension UIView {
     /**
     Returns current view transform with respect to the 'toView'.
     */
-    func convertTransformToView(var toView:UIView?)->CGAffineTransform {
+    public func convertTransformToView(var toView:UIView?)->CGAffineTransform {
         
         if toView == nil {
             toView = window
diff --git a/IQKeyboardManagerSwift/Categories/IQUIViewController+Additions.swift b/IQKeyboardManagerSwift/Categories/IQUIViewController+Additions.swift
new file mode 100755
index 0000000..8d6abb3
--- /dev/null
+++ b/IQKeyboardManagerSwift/Categories/IQUIViewController+Additions.swift
@@ -0,0 +1,46 @@
+//
+//  IQUIViewController+Additions.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+import UIKit
+
+
+private var kIQLayoutGuideConstraint = "kIQLayoutGuideConstraint"
+
+
+public extension UIViewController {
+
+    /**
+    To set customized distance from keyboard for textField/textView. Can't be less than zero
+    */
+    @IBOutlet public var IQLayoutGuideConstraint: NSLayoutConstraint? {
+        get {
+            
+            return objc_getAssociatedObject(self, &kIQLayoutGuideConstraint) as? NSLayoutConstraint
+        }
+
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQLayoutGuideConstraint, newValue,objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUIWindow+Hierarchy.swift b/IQKeyboardManagerSwift/Categories/IQUIWindow+Hierarchy.swift
old mode 100644
new mode 100755
similarity index 91%
rename from Clutch/IQKeybordManagerSwift/Categories/IQUIWindow+Hierarchy.swift
rename to IQKeyboardManagerSwift/Categories/IQUIWindow+Hierarchy.swift
index 522468e..5974c95
--- a/Clutch/IQKeybordManagerSwift/Categories/IQUIWindow+Hierarchy.swift
+++ b/IQKeyboardManagerSwift/Categories/IQUIWindow+Hierarchy.swift
@@ -1,7 +1,7 @@
 //
 //  IQUIWindow+Hierarchy.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +26,10 @@ import Foundation
 import UIKit
 
 /** @abstract UIWindow hierarchy category.  */
-extension UIWindow {
+public extension UIWindow {
 
     /** @return Returns the current Top Most ViewController in hierarchy.   */
-    override func topMostController()->UIViewController? {
+    override public func topMostController()->UIViewController? {
         
         var topController = rootViewController
         
@@ -41,7 +41,7 @@ extension UIWindow {
     }
     
     /** @return Returns the topViewController in stack of topMostController.    */
-    func currentViewController()->UIViewController? {
+    public func currentViewController()->UIViewController? {
         
         var currentViewController = topMostController()
         
diff --git a/Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstants.swift b/IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstants.swift
old mode 100644
new mode 100755
similarity index 98%
rename from Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstants.swift
rename to IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstants.swift
index 00ce5a9..b0f2b85
--- a/Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstants.swift
+++ b/IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstants.swift
@@ -1,7 +1,7 @@
 //
 //  IQKeyboardManagerConstants.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -47,13 +47,12 @@ Creates Toolbar according to tag property of TextField's.
 `IQAutoToolbarByPosition`
 Creates Toolbar according to the y,x position of textField in it's superview coordinate.
 */
-enum IQAutoToolbarManageBehaviour {
+public enum IQAutoToolbarManageBehaviour : Int {
     case BySubviews
     case ByTag
     case ByPosition
 }
 
-
 /*
 
 /---------------------------------------------------------------------------------------------------\
diff --git a/Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift b/IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift
old mode 100644
new mode 100755
similarity index 67%
rename from Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift
rename to IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift
index 7321b2a..76637e2
--- a/Clutch/IQKeybordManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift
+++ b/IQKeyboardManagerSwift/Constants/IQKeyboardManagerConstantsInternal.swift
@@ -1,7 +1,7 @@
 //
 //  IQKeyboardManagerConstantsInternal.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,4 +24,22 @@
 
 import Foundation
 
-let IQ_IS_IOS8_OR_GREATER = (floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_7_1)
+///-----------------------------------
+/// MARK: IQLayoutGuidePosition
+///-----------------------------------
+
+/**
+`IQLayoutGuidePositionNone`
+If there are no IQLayoutGuideConstraint associated with viewController
+
+`IQLayoutGuidePositionTop`
+If provided IQLayoutGuideConstraint is associated with with viewController topLayoutGuide
+
+`IQLayoutGuidePositionBottom`
+If provided IQLayoutGuideConstraint is associated with with viewController bottomLayoutGuide
+*/
+public enum IQLayoutGuidePosition : Int {
+    case None
+    case Top
+    case Bottom
+}
diff --git a/Clutch/IQKeybordManagerSwift/IQKeyboardManager.swift b/IQKeyboardManagerSwift/IQKeyboardManager.swift
old mode 100644
new mode 100755
similarity index 64%
rename from Clutch/IQKeybordManagerSwift/IQKeyboardManager.swift
rename to IQKeyboardManagerSwift/IQKeyboardManager.swift
index 0f47d91..d7b8ceb
--- a/Clutch/IQKeybordManagerSwift/IQKeyboardManager.swift
+++ b/IQKeyboardManagerSwift/IQKeyboardManager.swift
@@ -1,7 +1,7 @@
 //
 //  IQKeyboardManager.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,22 +30,21 @@ import UIKit
 /// MARK: IQToolbar tags
 ///---------------------
 
-/**
-Default tag for toolbar with Done button   -1002.
-*/
-let  kIQDoneButtonToolbarTag : Int          =   -1002
-
-/**
-Default tag for toolbar with Previous/Next buttons -1005.
-*/
-let  kIQPreviousNextButtonToolbarTag : Int  =   -1005
-
 /**
 Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView. Neither need to write any code nor any setup required and much more. A generic version of KeyboardManagement. https://developer.apple.com/Library/ios/documentation/StringsTextFonts/Conceptual/TextAndWebiPhoneOS/KeyboardManagement/KeyboardManagement.html
 */
 
-class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
+public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
+    
+    /**
+    Default tag for toolbar with Done button   -1002.
+    */
+    private static let  kIQDoneButtonToolbarTag         =   -1002
     
+    /**
+    Default tag for toolbar with Previous/Next buttons -1005.
+    */
+    private static let  kIQPreviousNextButtonToolbarTag =   -1005
     
     ///---------------------------
     ///  MARK: UIKeyboard handling
@@ -54,7 +53,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Enable/disable managing distance between keyboard and textField. Default is YES(Enabled when class loads in `+(void)load` method).
     */
-    var enable: Bool = false {
+    public var enable = false {
         
         didSet {
             //If not enable, enable it.
@@ -74,7 +73,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     To set keyboard distance from textField. can't be less than zero. Default is 10.0.
     */
-    var keyboardDistanceFromTextField: CGFloat {
+    public var keyboardDistanceFromTextField: CGFloat {
         
         set {
             _privateKeyboardDistanceFromTextField =  max(0, newValue)
@@ -88,12 +87,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Prevent keyboard manager to slide up the rootView to more than keyboard height. Default is YES.
     */
-    var preventShowingBottomBlankSpace = true
+    public var preventShowingBottomBlankSpace = true
     
     /**
     Returns the default singleton instance.
     */
-    class func sharedManager() -> IQKeyboardManager {
+    public class func sharedManager() -> IQKeyboardManager {
         
         struct Static {
             //Singleton instance. Initializing keyboard manger.
@@ -104,7 +103,6 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         return Static.kbManager
     }
     
-
     ///-------------------------
     /// MARK: IQToolbar handling
     ///-------------------------
@@ -112,13 +110,13 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Automatic add the IQToolbar functionality. Default is YES.
     */
-    var enableAutoToolbar: Bool = true {
+    public var enableAutoToolbar = true {
         
         didSet {
 
             enableAutoToolbar ?addToolbarIfRequired():removeToolbarIfRequired()
 
-            var enableToolbar = enableAutoToolbar ? "Yes" : "NO"
+            let enableToolbar = enableAutoToolbar ? "Yes" : "NO"
 
             _IQShowLog("enableAutoToolbar: \(enableToolbar)")
         }
@@ -127,22 +125,37 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     AutoToolbar managing behaviour. Default is IQAutoToolbarBySubviews.
     */
-    var toolbarManageBehaviour = IQAutoToolbarManageBehaviour.BySubviews
+    public var toolbarManageBehaviour = IQAutoToolbarManageBehaviour.BySubviews
 
     /**
     If YES, then uses textField's tintColor property for IQToolbar, otherwise tint color is black. Default is NO.
     */
-    var shouldToolbarUsesTextFieldTintColor = false
+    public var shouldToolbarUsesTextFieldTintColor = false
+    
+    /**
+    This is used for toolbar.tintColor when textfield.keyboardAppearance is UIKeyboardAppearanceDefault. If shouldToolbarUsesTextFieldTintColor is YES then this property is ignored. Default is nil and uses black color.
+    */
+    public var toolbarTintColor : UIColor?
+
+    /**
+     Toolbar done button icon, If nothing is provided then check toolbarDoneBarButtonItemText to draw done button.
+     */
+    public var toolbarDoneBarButtonItemImage : UIImage?
     
+    /**
+     Toolbar done button text, If nothing is provided then system default 'UIBarButtonSystemItemDone' will be used.
+     */
+    public var toolbarDoneBarButtonItemText : String?
+
     /**
     If YES, then it add the textField's placeholder text on IQToolbar. Default is YES.
     */
-    var shouldShowTextFieldPlaceholder = true
+    public var shouldShowTextFieldPlaceholder = true
     
     /**
     Placeholder Font. Default is nil.
     */
-    var placeholderFont: UIFont?
+    public var placeholderFont: UIFont?
     
     
     ///--------------------------
@@ -152,12 +165,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Adjust textView's frame when it is too big in height. Default is NO.
     */
-    var canAdjustTextView = false
+    public var canAdjustTextView = false
 
     /**
     Adjust textView's contentInset to fix a bug. for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string Default is YES.
     */
-    var shouldFixTextViewClip = true
+    public var shouldFixTextViewClip = true
 
     
     ///---------------------------------------
@@ -167,12 +180,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Override the keyboardAppearance for all textField/textView. Default is NO.
     */
-    var overrideKeyboardAppearance = false
+    public var overrideKeyboardAppearance = false
     
     /**
     If overrideKeyboardAppearance is YES, then all the textField keyboardAppearance is set using this property.
     */
-    var keyboardAppearance = UIKeyboardAppearance.Default
+    public var keyboardAppearance = UIKeyboardAppearance.Default
 
     
     ///-----------------------------------------------------------
@@ -183,7 +196,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Resigns Keyboard on touching outside of UITextField/View. Default is NO.
     */
-    var shouldResignOnTouchOutside: Bool = false {
+    public var shouldResignOnTouchOutside = false {
         
         didSet {
             _tapGesture.enabled = shouldResignOnTouchOutside
@@ -197,7 +210,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Resigns currently first responder field.
     */
-    func resignFirstResponder() {
+    public func resignFirstResponder()-> Bool {
         
         if let textFieldRetain = _textFieldView {
             
@@ -211,25 +224,28 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 
                 _IQShowLog("Refuses to resign first responder: \(_textFieldView?._IQDescription())")
             }
+            
+            return isResignFirstResponder
         }
+        
+        return false
     }
     
     /**
     Returns YES if can navigate to previous responder textField/textView, otherwise NO.
     */
-    var canGoPrevious: Bool {
+    public var canGoPrevious: Bool {
         
         get {
             //Getting all responder view's.
             if let textFields = responderViews() {
                 if let  textFieldRetain = _textFieldView {
-                    if textFields.containsObject(textFieldRetain) == true {
-                        //Getting index of current textField.
-                        let index = textFields.indexOfObject(textFieldRetain)
+                    
+                    //Getting index of current textField.
+                    if let index = textFields.indexOf(textFieldRetain) {
                         
                         //If it is not first textField. then it's previous object canBecomeFirstResponder.
                         if index > 0 {
-                            
                             return true
                         }
                     }
@@ -242,20 +258,17 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Returns YES if can navigate to next responder textField/textView, otherwise NO.
     */
-    var canGoNext: Bool {
+    public var canGoNext: Bool {
         
         get {
             //Getting all responder view's.
             if let textFields = responderViews() {
                 if let  textFieldRetain = _textFieldView {
-                    if textFields.containsObject(textFieldRetain) == true {
-                        
-                        //Getting index of current textField.
-                        let index = textFields.indexOfObject(textFieldRetain)
+                    //Getting index of current textField.
+                    if let index = textFields.indexOf(textFieldRetain) {
                         
-                        //If it is not last textField. then it's next object canBecomeFirstResponder.
+                        //If it is not first textField. then it's previous object canBecomeFirstResponder.
                         if index < textFields.count-1 {
-                            
                             return true
                         }
                     }
@@ -268,19 +281,18 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     Navigate to previous responder textField/textView.
     */
-    func goPrevious() {
+    public func goPrevious()-> Bool {
         
         //Getting all responder view's.
-        if let textFields = responderViews() {
-            if let  textFieldRetain = _textFieldView {
-                if textFields.containsObject(textFieldRetain) == true {
-                    //Getting index of current textField.
-                    let index = textFields.indexOfObject(textFieldRetain)
+        if let  textFieldRetain = _textFieldView {
+            if let textFields = responderViews() {
+                //Getting index of current textField.
+                if let index = textFields.indexOf(textFieldRetain) {
                     
                     //If it is not first textField. then it's previous object becomeFirstResponder.
                     if index > 0 {
                         
-                        let nextTextField = textFields[index-1] as! UIView
+                        let nextTextField = textFields[index-1]
                         
                         let isAcceptAsFirstResponder = nextTextField.becomeFirstResponder()
                         
@@ -291,29 +303,30 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             
                             _IQShowLog("Refuses to become first responder: \(nextTextField._IQDescription())")
                         }
+                        
+                        return isAcceptAsFirstResponder
                     }
                 }
             }
         }
+        
+        return false
     }
     
     /**
     Navigate to next responder textField/textView.
     */
-    func goNext() {
+    public func goNext()-> Bool {
 
         //Getting all responder view's.
-        if let textFields = responderViews() {
-            if let  textFieldRetain = _textFieldView {
-                if textFields.containsObject(textFieldRetain) == true {
-                    
-                    //Getting index of current textField.
-                    let index = textFields.indexOfObject(textFieldRetain)
-                    
+        if let  textFieldRetain = _textFieldView {
+            if let textFields = responderViews() {
+                //Getting index of current textField.
+                if let index = textFields.indexOf(textFieldRetain) {
                     //If it is not last textField. then it's next object becomeFirstResponder.
                     if index < textFields.count-1 {
                         
-                        let nextTextField = textFields[index+1] as! UIView
+                        let nextTextField = textFields[index+1]
                         
                         let isAcceptAsFirstResponder = nextTextField.becomeFirstResponder()
                         
@@ -324,14 +337,18 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             
                             _IQShowLog("Refuses to become first responder: \(nextTextField._IQDescription())")
                         }
+                        
+                        return isAcceptAsFirstResponder
                     }
                 }
             }
         }
+
+        return false
     }
     
     /**	previousAction. */
-    func previousAction (segmentedControl : AnyObject?) {
+    internal func previousAction (barButton : UIBarButtonItem?) {
         
         //If user wants to play input Click sound.
         if shouldPlayInputClicks == true {
@@ -340,12 +357,20 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         
         if canGoPrevious == true {
-            goPrevious()
+            
+            if let textFieldRetain = _textFieldView {
+                let isAcceptAsFirstResponder = goPrevious()
+                
+                if isAcceptAsFirstResponder && textFieldRetain.previousInvocation.target != nil && textFieldRetain.previousInvocation.selector != nil {
+                    
+                    UIApplication.sharedApplication().sendAction(textFieldRetain.previousInvocation.selector!, to: textFieldRetain.previousInvocation.target, from: textFieldRetain, forEvent: UIEvent())
+                }
+            }
         }
     }
     
     /**	nextAction. */
-    func nextAction (segmentedControl : AnyObject?) {
+    internal func nextAction (barButton : UIBarButtonItem?) {
         
         //If user wants to play input Click sound.
         if shouldPlayInputClicks == true {
@@ -353,13 +378,21 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             UIDevice.currentDevice().playInputClick()
         }
         
-        if canGoNext {
-            goNext()
+        if canGoNext == true {
+            
+            if let textFieldRetain = _textFieldView {
+                let isAcceptAsFirstResponder = goNext()
+                
+                if isAcceptAsFirstResponder && textFieldRetain.nextInvocation.target != nil && textFieldRetain.nextInvocation.selector != nil {
+                    
+                    UIApplication.sharedApplication().sendAction(textFieldRetain.nextInvocation.selector!, to: textFieldRetain.nextInvocation.target, from: textFieldRetain, forEvent: UIEvent())
+                }
+            }
         }
     }
     
     /**	doneAction. Resigning current textField. */
-    func doneAction (barButton : IQBarButtonItem?) {
+    internal func doneAction (barButton : IQBarButtonItem?) {
         
         //If user wants to play input Click sound.
         if shouldPlayInputClicks == true {
@@ -367,40 +400,38 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             UIDevice.currentDevice().playInputClick()
         }
         
-        //Resign textFieldView.
-        resignFirstResponder()
+        if let textFieldRetain = _textFieldView {
+            //Resign textFieldView.
+            let isResignedFirstResponder = resignFirstResponder()
+            
+            if isResignedFirstResponder && textFieldRetain.doneInvocation.target != nil  && textFieldRetain.doneInvocation.selector != nil{
+                
+                UIApplication.sharedApplication().sendAction(textFieldRetain.doneInvocation.selector!, to: textFieldRetain.doneInvocation.target, from: textFieldRetain, forEvent: UIEvent())
+            }
+        }
     }
     
     /** Resigning on tap gesture.   (Enhancement ID: #14)*/
-    func tapRecognized(gesture: UITapGestureRecognizer) {
+    internal func tapRecognized(gesture: UITapGestureRecognizer) {
         
         if gesture.state == UIGestureRecognizerState.Ended {
+
             //Resigning currently responder textField.
-            gesture.view?.endEditing(true)
+            resignFirstResponder()
         }
     }
     
     /** Note: returning YES is guaranteed to allow simultaneous recognition. returning NO is not guaranteed to prevent simultaneous recognition, as the other gesture's delegate may return YES. */
-    func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWithGestureRecognizer otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    public func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWithGestureRecognizer otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         return false
     }
     
     /** To not detect touch events in a subclass of UIControl, these may have added their own selector for specific work */
-    func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldReceiveTouch touch: UITouch) -> Bool {
+    public func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldReceiveTouch touch: UITouch) -> Bool {
         //  Should not recognize gesture if the clicked view is either UIControl or UINavigationBar(<Back button etc...)    (Bug ID: #145)
         return (touch.view is UIControl || touch.view is UINavigationBar) ? false : true
     }
     
-    ///----------------------------
-    /// MARK: UIScrollView handling
-    ///----------------------------
-    
-    /**
-    Restore scrollViewContentOffset when resigning from scrollView. Default is NO.
-    */
-    var shouldRestoreScrollViewContentOffset = false
-
-    
     ///-----------------------
     /// MARK: UISound handling
     ///-----------------------
@@ -408,7 +439,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**
     If YES, then it plays inputClick sound on next/previous/done click.
     */
-    var shouldPlayInputClicks = false
+    public var shouldPlayInputClicks = false
     
     
     ///---------------------------
@@ -420,12 +451,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @warning Sometimes strange animations may be produced if uses default curve style animation in iOS 7 and changing the textFields very frequently.
     */
-    var shouldAdoptDefaultKeyboardAnimation = true
+    public var shouldAdoptDefaultKeyboardAnimation = true
 
     /**
     If YES, then calls 'setNeedsLayout' and 'layoutIfNeeded' on any frame update of to viewController's view.
     */
-    var layoutIfNeededOnUpdate = false
+    public var layoutIfNeededOnUpdate = false
 
     ///------------------------------------
     /// MARK: Class Level disabling methods
@@ -436,8 +467,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param disabledClass Class in which library should not adjust view to show textField.
     */
-    func disableInViewControllerClass(disabledClass : AnyClass) {
-        _disabledClasses.addObject(NSStringFromClass(disabledClass))
+    public func disableDistanceHandlingInViewControllerClass(disabledClass : AnyClass) {
+        _disabledClasses.insert(NSStringFromClass(disabledClass))
     }
     
     /**
@@ -445,17 +476,15 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param disabledClass Class in which library should re-enable adjust view to show textField.
     */
-    func removeDisableInViewControllerClass(disabledClass : AnyClass) {
-        _disabledClasses.removeObject(NSStringFromClass(disabledClass))
+    public func removeDisableDistanceHandlingInViewControllerClass(disabledClass : AnyClass) {
+        _disabledClasses.remove(NSStringFromClass(disabledClass))
     }
     
     /**
-    Returns YES if ViewController class is disabled for library, otherwise returns NO.
-    
-    @param disabledClass Class which is to check for it's disability.
-    */
-    func isDisableInViewControllerClass(disabledClass : AnyClass) -> Bool {
-        return _disabledClasses.containsObject(NSStringFromClass(disabledClass))
+     Returns All disabled classes registered with disableInViewControllerClass.
+     */
+    public func disabledInViewControllerClassesString() -> Set<String> {
+        return _disabledClasses
     }
     
     /**
@@ -463,8 +492,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarDisabledClass Class in which library should not add toolbar over textField.
     */
-    func disableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
-        _disabledToolbarClasses.addObject(NSStringFromClass(toolbarDisabledClass))
+    public func disableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
+        _disabledToolbarClasses.insert(NSStringFromClass(toolbarDisabledClass))
     }
     
     /**
@@ -472,8 +501,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarDisabledClass Class in which library should re-enable automatic toolbar creation over textField.
     */
-    func removeDisableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
-        _disabledToolbarClasses.removeObject(NSStringFromClass(toolbarDisabledClass))
+    public func removeDisableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
+        _disabledToolbarClasses.remove(NSStringFromClass(toolbarDisabledClass))
     }
     
     /**
@@ -481,8 +510,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarDisabledClass Class which is to check for toolbar disability.
     */
-    func isDisableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) -> Bool {
-        return _disabledToolbarClasses.containsObject(NSStringFromClass(toolbarDisabledClass))
+    public func disabledToolbarInViewControllerClassesString() -> Set<String> {
+        return _disabledToolbarClasses
     }
     
     /**
@@ -490,8 +519,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarPreviousNextConsideredClass Custom UIView subclass Class in which library should consider all inner textField as siblings and add next/previous accordingly.
     */
-    func considerToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
-        _toolbarPreviousNextConsideredClass.addObject(NSStringFromClass(toolbarPreviousNextConsideredClass))
+    public func considerToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
+        _toolbarPreviousNextConsideredClass.insert(NSStringFromClass(toolbarPreviousNextConsideredClass))
     }
     
     /**
@@ -499,8 +528,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarPreviousNextConsideredClass Custom UIView subclass Class in which library should remove consideration for all inner textField as superView.
     */
-    func removeConsiderToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
-        _toolbarPreviousNextConsideredClass.removeObject(NSStringFromClass(toolbarPreviousNextConsideredClass))
+    public func removeConsiderToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
+        _toolbarPreviousNextConsideredClass.remove(NSStringFromClass(toolbarPreviousNextConsideredClass))
     }
     
     /**
@@ -508,10 +537,26 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarPreviousNextConsideredClass Class which is to check for previous next consideration
     */
-    func isConsiderToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) -> Bool {
-        return _toolbarPreviousNextConsideredClass.containsObject(NSStringFromClass(toolbarPreviousNextConsideredClass))
+    public func consideredToolbarPreviousNextViewClassesString() -> Set<String> {
+        return _toolbarPreviousNextConsideredClass
     }
 
+    ///-------------------------------------------
+    /// MARK: Third Party Library support
+    /// Add TextField/TextView Notifications customised NSNotifications. For example while using YYTextView https://github.com/ibireme/YYText
+    ///-------------------------------------------
+    
+    /**
+    Add customised Notification for third party customised TextField/TextView. Please be aware that the NSNotification object must be idential to UITextField/UITextView NSNotification objects and customised TextField/TextView support must be idential to UITextField/UITextView.
+    @param didBeginEditingNotificationName This should be identical to UITextViewTextDidBeginEditingNotification
+    @param didEndEditingNotificationName This should be identical to UITextViewTextDidEndEditingNotification
+    */
+    
+    public func addTextFieldViewDidBeginEditingNotificationName(didBeginEditingNotificationName : String, didEndEditingNotificationName : String) {
+        
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidBeginEditing:",    name: didBeginEditingNotificationName, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidEndEditing:",      name: didEndEditingNotificationName, object: nil)
+    }
 
     /**************************************************************************************/
     ///------------------------
@@ -532,9 +577,9 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /** To save rootViewController */
     private weak var    _rootViewController: UIViewController?
     
-    /** used with canAdjustTextView to detect a textFieldView frame is changes or not. (Bug ID: #92)*/
-    private var         _isTextFieldViewFrameChanged = false
-    
+    /** To save topBottomLayoutConstraint original constant */
+    private var         _layoutGuideConstraintInitialConstant: CGFloat  = 0.25
+
     /*******************************************/
 
     /** Variable to save lastScrollView that was scrolled. */
@@ -563,9 +608,6 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /** To mimic the keyboard animation */
     private var         _animationCurve = UIViewAnimationOptions.CurveEaseOut
     
-    /** Boolean to maintain keyboard is showing or it is hide. To solve rootViewController.view.frame calculations. */
-    private var         _isKeyboardShowing = false
-    
     /*******************************************/
 
     /** TapGesture to resign keyboard on view's touch. */
@@ -573,28 +615,32 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     /*******************************************/
     
-    /** Default toolbar tintColor to be used within the project. Default is black. */
-    private var         _defaultToolbarTintColor = UIColor.blackColor()
-
-    /*******************************************/
-    
     /** Set of restricted classes for library */
-    private var _disabledClasses  = NSMutableSet()
+    private var         _disabledClasses  = Set<String>()
     
     /** Set of restricted classes for adding toolbar */
-    private var _disabledToolbarClasses  = NSMutableSet()
+    private var         _disabledToolbarClasses  = Set<String>()
     
     /** Set of permitted classes to add all inner textField as siblings */
-    private var _toolbarPreviousNextConsideredClass  = NSMutableSet()
+    private var         _toolbarPreviousNextConsideredClass  = Set<String>()
  
     /*******************************************/
 
+    private struct flags {
+        /** used with canAdjustTextView to detect a textFieldView frame is changes or not. (Bug ID: #92)*/
+        var isTextFieldViewFrameChanged = false
+        /** Boolean to maintain keyboard is showing or it is hide. To solve rootViewController.view.frame calculations. */
+        var isKeyboardShowing = false
+    }
+    
+    /** Private flags to use within the project */
+    private var _keyboardManagerFlags = flags(isTextFieldViewFrameChanged: false, isKeyboardShowing: false)
+
     /** To use with keyboardDistanceFromTextField. */
     private var         _privateKeyboardDistanceFromTextField: CGFloat = 10.0
     
     /**************************************************************************************/
     
-    
     ///--------------------------------------
     /// MARK: Initialization/Deinitialization
     ///--------------------------------------
@@ -609,13 +655,11 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardWillHide:",                name: UIKeyboardWillHideNotification, object: nil)
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardDidHide:",                name: UIKeyboardDidHideNotification, object: nil)
         
-        //  Registering for textField notification.
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidBeginEditing:",    name: UITextFieldTextDidBeginEditingNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidEndEditing:",      name: UITextFieldTextDidEndEditingNotification, object: nil)
+        //  Registering for UITextField notification.
+        addTextFieldViewDidBeginEditingNotificationName(UITextFieldTextDidBeginEditingNotification, didEndEditingNotificationName: UITextFieldTextDidEndEditingNotification)
         
-        //  Registering for textView notification.
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidBeginEditing:",    name: UITextViewTextDidBeginEditingNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidEndEditing:",      name: UITextViewTextDidEndEditingNotification, object: nil)
+        //  Registering for UITextView notification.
+        addTextFieldViewDidBeginEditingNotificationName(UITextViewTextDidBeginEditingNotification, didEndEditingNotificationName: UITextViewTextDidEndEditingNotification)
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidChange:",          name: UITextViewTextDidChangeNotification, object: nil)
         
         //  Registering for orientation changes notification
@@ -623,18 +667,24 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
 
         //Creating gesture for @shouldResignOnTouchOutside. (Enhancement ID: #14)
         _tapGesture = UITapGestureRecognizer(target: self, action: "tapRecognized:")
+        _tapGesture.cancelsTouchesInView = false
         _tapGesture.delegate = self
         _tapGesture.enabled = shouldResignOnTouchOutside
         
+        disableDistanceHandlingInViewControllerClass(UITableViewController)
+        considerToolbarPreviousNextInViewClass(UITableView)
+        considerToolbarPreviousNextInViewClass(UICollectionView)
         
-        _disabledClasses.addObject(NSStringFromClass(UITableViewController))
-        _toolbarPreviousNextConsideredClass.addObject(NSStringFromClass(UITableView))
-        _toolbarPreviousNextConsideredClass.addObject(NSStringFromClass(UICollectionView))
+        //Workaround to load all appearance proxies at startup
+        let barButtonItem2 = IQTitleBarButtonItem()
+        barButtonItem2.title = ""
+        let toolbar = IQToolbar()
+        toolbar.title = ""
     }
     
-    
     /** Override +load method to enable KeyboardManager when class loader load IQKeyboardManager. Enabling when app starts (No need to write any code) */
-//    override class func load() {
+    /** It doesn't work from Swift 1.2 */
+//    override public class func load() {
 //        super.load()
 //        
 //        //Enabling IQKeyboardManager.
@@ -652,8 +702,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /** Getting keyWindow. */
     private func keyWindow() -> UIWindow? {
         
-        if _textFieldView?.window != nil {
-            return _textFieldView?.window
+        if let keyWindow = _textFieldView?.window {
+            return keyWindow
         } else {
             
             struct Static {
@@ -661,7 +711,6 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 @discussion Sometimes [[UIApplication sharedApplication] keyWindow] is returning nil between the app.   */
                 static var keyWindow : UIWindow?
             }
-            
 
             /*  (Bug ID: #23, #25, #73)   */
             let originalKeyWindow = UIApplication.sharedApplication().keyWindow
@@ -675,8 +724,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             return Static.keyWindow
         }
     }
-    
-    
+
     ///-----------------------
     /// MARK: Helper Functions
     ///-----------------------
@@ -693,12 +741,10 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         if let unwrappedController = controller {
             //frame size needs to be adjusted on iOS8 due to orientation structure changes.
-            if IQ_IS_IOS8_OR_GREATER == true {
-                frame.size = unwrappedController.view.frame.size
-            }
+            frame.size = unwrappedController.view.frame.size
             
             //Used UIViewAnimationOptionBeginFromCurrentState to minimize strange animations.
-            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                 
                 //  Setting it's new frame
                 unwrappedController.view.frame = frame
@@ -717,8 +763,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             _IQShowLog("You must set UIWindow.rootViewController in your AppDelegate to work with IQKeyboardManager")
         }
     }
-    
-    /* Adjusting RootViewController's frame according to device orientation. */
+
+    /* Adjusting RootViewController's frame according to interface orientation. */
     private func adjustFrame() {
         
         //  We are unable to get textField object while keyboard showing on UIWebView's textField.  (Bug ID: #11)
@@ -726,10 +772,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             return
         }
         
+        let textFieldView = _textFieldView!
+
         _IQShowLog("****** \(__FUNCTION__) %@ started ******")
 
         //  Boolean to know keyboard is showing/hiding
-        _isKeyboardShowing = true
+        _keyboardManagerFlags.isKeyboardShowing = true
         
         //  Getting KeyWindow object.
         let optionalWindow = keyWindow()
@@ -741,7 +789,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         
         //  Converting Rectangle according to window bounds.
-        let optionalTextFieldViewRect = _textFieldView?.superview?.convertRect(_textFieldView!.frame, toView: optionalWindow)
+        let optionalTextFieldViewRect = textFieldView.superview?.convertRect(textFieldView.frame, toView: optionalWindow)
 
         if optionalRootController == nil || optionalWindow == nil || optionalTextFieldViewRect == nil {
             return
@@ -749,49 +797,66 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         let rootController = optionalRootController!
         let window = optionalWindow!
-        let textFieldView = _textFieldView!
         let textFieldViewRect = optionalTextFieldViewRect!
         
-        //If it's iOS8 then we should do calculations according to portrait orientations.   //  (Bug ID: #64, #66)
-        let interfaceOrientation = (IQ_IS_IOS8_OR_GREATER) ? UIInterfaceOrientation.Portrait : rootController.interfaceOrientation
-
         //  Getting RootViewRect.
         var rootViewRect = rootController.view.frame
-
         //Getting statusBarFrame
-        var topLayoutGuide : CGFloat = 0
+
+        //Maintain keyboardDistanceFromTextField
+        let newKeyboardDistanceFromTextField = (textFieldView.keyboardDistanceFromTextField == kIQUseDefaultKeyboardDistance) ? keyboardDistanceFromTextField : textFieldView.keyboardDistanceFromTextField
+        var kbSize = _kbSize
+        kbSize.height += newKeyboardDistanceFromTextField
+
+        let statusBarFrame = UIApplication.sharedApplication().statusBarFrame
         
-       let statusBarFrame = UIApplication.sharedApplication().statusBarFrame
+        //  (Bug ID: #250)
+        var layoutGuidePosition = IQLayoutGuidePosition.None
         
-        switch interfaceOrientation {
-        case UIInterfaceOrientation.LandscapeLeft, UIInterfaceOrientation.LandscapeRight:
-            topLayoutGuide = CGRectGetWidth(statusBarFrame)
-        case UIInterfaceOrientation.Portrait, UIInterfaceOrientation.PortraitUpsideDown:
-            topLayoutGuide = CGRectGetHeight(statusBarFrame)
-        default:    break
+        if let viewController = textFieldView.viewController() {
+            
+            if let constraint = viewController.IQLayoutGuideConstraint {
+                
+                var layoutGuide : UILayoutSupport?
+                if let itemLayoutGuide = constraint.firstItem as? UILayoutSupport {
+                    layoutGuide = itemLayoutGuide
+                } else if let itemLayoutGuide = constraint.secondItem as? UILayoutSupport {
+                    layoutGuide = itemLayoutGuide
+                }
+                
+                if let itemLayoutGuide : UILayoutSupport = layoutGuide {
+                    
+                    if (itemLayoutGuide === viewController.topLayoutGuide)    //If topLayoutGuide constraint
+                    {
+                        layoutGuidePosition = .Top
+                    }
+                    else if (itemLayoutGuide === viewController.bottomLayoutGuide)    //If bottomLayoutGuice constraint
+                    {
+                        layoutGuidePosition = .Bottom
+                    }
+                }
+            }
         }
+        
+        let topLayoutGuide : CGFloat = CGRectGetHeight(statusBarFrame)
 
         var move : CGFloat = 0.0
         //  Move positive = textField is hidden.
         //  Move negative = textField is showing.
         
-        //  Calculating move position. Common for both normal and special cases.
-        switch interfaceOrientation {
-        case UIInterfaceOrientation.LandscapeLeft:
-            move = min(CGRectGetMinX(textFieldViewRect)-(topLayoutGuide+5), CGRectGetMaxX(textFieldViewRect)-(CGRectGetWidth(window.frame)-_kbSize.width))
-        case UIInterfaceOrientation.LandscapeRight:
-            move = min(CGRectGetWidth(window.frame)-CGRectGetMaxX(textFieldViewRect)-(topLayoutGuide+5), _kbSize.width-CGRectGetMinX(textFieldViewRect))
-        case UIInterfaceOrientation.Portrait:
-            move = min(CGRectGetMinY(textFieldViewRect)-(topLayoutGuide+5), CGRectGetMaxY(textFieldViewRect)-(CGRectGetHeight(window.frame)-_kbSize.height))
-        case UIInterfaceOrientation.PortraitUpsideDown:
-            move = min(CGRectGetHeight(window.frame)-CGRectGetMaxY(textFieldViewRect)-(topLayoutGuide+5), _kbSize.height-CGRectGetMinY(textFieldViewRect))
-        default:    break
+        //  Checking if there is bottomLayoutGuide attached (Bug ID: #250)
+        if layoutGuidePosition == .Bottom {
+            //  Calculating move position.
+            move = CGRectGetMaxY(textFieldViewRect)-(CGRectGetHeight(window.frame)-kbSize.height)
+        } else {
+            //  Calculating move position. Common for both normal and special cases.
+            move = min(CGRectGetMinY(textFieldViewRect)-(topLayoutGuide+5), CGRectGetMaxY(textFieldViewRect)-(CGRectGetHeight(window.frame)-kbSize.height))
         }
         
         _IQShowLog("Need to move: \(move)")
 
         //  Getting it's superScrollView.   //  (Enhancement ID: #21, #24)
-        let superScrollView : UIScrollView? = textFieldView.superviewOfClassType(UIScrollView) as? UIScrollView
+        let superScrollView = textFieldView.superviewOfClassType(UIScrollView) as? UIScrollView
         
         //If there was a lastScrollView.    //  (Bug ID: #34)
         if let lastScrollView = _lastScrollView {
@@ -800,13 +865,13 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 
                 _IQShowLog("Restoring \(lastScrollView._IQDescription()) contentInset to : \(_startingContentInsets) and contentOffset to : \(_startingContentOffset)")
 
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                     
                     lastScrollView.contentInset = self._startingContentInsets
                     lastScrollView.scrollIndicatorInsets = self._startingScrollIndicatorInsets
                     }) { (animated:Bool) -> Void in }
                 
-                if shouldRestoreScrollViewContentOffset == true {
+                if lastScrollView.shouldRestoreScrollViewContentOffset == true {
                     lastScrollView.setContentOffset(_startingContentOffset, animated: true)
                 }
                 
@@ -818,13 +883,13 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 
                 _IQShowLog("Restoring \(lastScrollView._IQDescription()) contentInset to : \(_startingContentInsets) and contentOffset to : \(_startingContentOffset)")
                 
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                     
                     lastScrollView.contentInset = self._startingContentInsets
                     lastScrollView.scrollIndicatorInsets = self._startingScrollIndicatorInsets
                     }) { (animated:Bool) -> Void in }
                 
-                if shouldRestoreScrollViewContentOffset == true {
+                if lastScrollView.shouldRestoreScrollViewContentOffset == true {
                     lastScrollView.setContentOffset(_startingContentOffset, animated: true)
                 }
 
@@ -844,8 +909,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
 
             _IQShowLog("Saving \(unwrappedSuperScrollView._IQDescription()) contentInset : \(_startingContentInsets) and contentOffset : \(_startingContentOffset)")
         }
-
-
+        
         //  Special case for ScrollView.
         //  If we found lastScrollView then setting it's contentOffset to show textField.
         if let lastScrollView = _lastScrollView {
@@ -856,7 +920,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             while let scrollView = superScrollView {
                 
                 //Looping in upper hierarchy until we don't found any scrollView in it's upper hirarchy till UIWindow object.
-                if move > 0 ? move > -scrollView.contentOffset.y - scrollView.contentInset.top : scrollView.contentOffset.y>0 {
+                if move > 0 ? (move > (-scrollView.contentOffset.y - scrollView.contentInset.top)) : scrollView.contentOffset.y>0 {
                     
                     //Getting lastViewRect.
                     if let lastViewRect = lastView.superview?.convertRect(lastView.frame, toView: scrollView) {
@@ -867,11 +931,11 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                         //Rearranging the expected Y offset according to the view.
                         shouldOffsetY = min(shouldOffsetY, lastViewRect.origin.y /*-5*/)   //-5 is for good UI.//Commenting -5 (Bug ID: #69)
 
-                        
+                        //[_textFieldView isKindOfClass:[UITextView class]] If is a UITextView type
                         //[superScrollView superviewOfClassType:[UIScrollView class]] == nil    If processing scrollView is last scrollView in upper hierarchy (there is no other scrollView upper hierrchy.)
                         //[_textFieldView isKindOfClass:[UITextView class]] If is a UITextView type
-                        //shouldOffsetY > 0     shouldOffsetY must be greater than in order to keep distance from navigationBar (Bug ID: #92)
-                        if textFieldView is UITextView == true && scrollView.superviewOfClassType(UIScrollView) == nil && shouldOffsetY > 0 {
+                        //shouldOffsetY >= 0     shouldOffsetY must be greater than in order to keep distance from navigationBar (Bug ID: #92)
+                        if textFieldView is UITextView == true && scrollView.superviewOfClassType(UIScrollView) == nil && shouldOffsetY >= 0 {
                             var maintainTopLayout : CGFloat = 0
                             
                             if let navigationBarFrame = textFieldView.viewController()?.navigationController?.navigationBar.frame {
@@ -882,20 +946,9 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             
                             //  Converting Rectangle according to window bounds.
                             if let currentTextFieldViewRect = textFieldView.superview?.convertRect(textFieldView.frame, toView: window) {
-                                var expectedFixDistance = shouldOffsetY
-                                
+
                                 //Calculating expected fix distance which needs to be managed from navigation bar
-                                switch interfaceOrientation {
-                                case UIInterfaceOrientation.LandscapeLeft:
-                                    expectedFixDistance = CGRectGetMinX(currentTextFieldViewRect) - maintainTopLayout
-                                case UIInterfaceOrientation.LandscapeRight:
-                                    expectedFixDistance = (CGRectGetWidth(window.frame)-CGRectGetMaxX(currentTextFieldViewRect)) - maintainTopLayout
-                                case UIInterfaceOrientation.Portrait:
-                                    expectedFixDistance = CGRectGetMinY(currentTextFieldViewRect) - maintainTopLayout
-                                case UIInterfaceOrientation.PortraitUpsideDown:
-                                    expectedFixDistance = (CGRectGetHeight(window.frame)-CGRectGetMaxY(currentTextFieldViewRect)) - maintainTopLayout
-                                default:    break
-                                }
+                                let expectedFixDistance = CGRectGetMinY(currentTextFieldViewRect) - maintainTopLayout
                                 
                                 //Now if expectedOffsetY (superScrollView.contentOffset.y + expectedFixDistance) is lower than current shouldOffsetY, which means we're in a position where navigationBar up and hide, then reducing shouldOffsetY with expectedOffsetY (superScrollView.contentOffset.y + expectedFixDistance)
                                 shouldOffsetY = min(shouldOffsetY, scrollView.contentOffset.y + expectedFixDistance)
@@ -914,10 +967,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             move -= (shouldOffsetY-scrollView.contentOffset.y)
                         }
                         
-                        
-                        
                         //Getting problem while using `setContentOffset:animated:`, So I used animation API.
-                        UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                        UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                         
                             self._IQShowLog("Adjusting \(scrollView.contentOffset.y-shouldOffsetY) to \(scrollView._IQDescription()) ContentOffset")
                             
@@ -934,24 +985,11 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                     break
                 }
             }
-
             
             //Updating contentInset
             if let lastScrollViewRect = lastScrollView.superview?.convertRect(lastScrollView.frame, toView: window) {
                 
-                var bottom : CGFloat = 0.0
-                
-                switch interfaceOrientation {
-                case UIInterfaceOrientation.LandscapeLeft:
-                    bottom = _kbSize.width-(CGRectGetWidth(window.frame)-CGRectGetMaxX(lastScrollViewRect))
-                case UIInterfaceOrientation.LandscapeRight:
-                    bottom = _kbSize.width-CGRectGetMinX(lastScrollViewRect)
-                case UIInterfaceOrientation.Portrait:
-                    bottom = _kbSize.height-(CGRectGetHeight(window.frame)-CGRectGetMaxY(lastScrollViewRect))
-                case UIInterfaceOrientation.PortraitUpsideDown:
-                    bottom = _kbSize.height-CGRectGetMinY(lastScrollViewRect)
-                default:    break
-                }
+                let bottom : CGFloat = kbSize.height-(CGRectGetHeight(window.frame)-CGRectGetMaxY(lastScrollViewRect))
                 
                 // Update the insets so that the scroll vew doesn't shift incorrectly when the offset is near the bottom of the scroll view.
                 var movedInsets = lastScrollView.contentInset
@@ -961,7 +999,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 _IQShowLog("\(lastScrollView._IQDescription()) old ContentInset : \(lastScrollView.contentInset)")
                 
                 //Getting problem while using `setContentOffset:animated:`, So I used animation API.
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                     lastScrollView.contentInset = movedInsets
 
                     var newInset = lastScrollView.scrollIndicatorInsets
@@ -982,155 +1020,136 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         //Going ahead. No else if.
         
-        
-        //Special case for UITextView(Readjusting the move variable when textView hight is too big to fit on screen)
-        //_canAdjustTextView    If we have permission to adjust the textView, then let's do it on behalf of user  (Enhancement ID: #15)
-        //_lastScrollView       If not having inside any scrollView, (now contentInset manages the full screen textView.
-        //[_textFieldView isKindOfClass:[UITextView class]] If is a UITextView type
-        //_isTextFieldViewFrameChanged  If frame is not change by library in past  (Bug ID: #92)
-        if canAdjustTextView == true && _lastScrollView == nil && textFieldView is UITextView == true && _isTextFieldViewFrameChanged == false {
-            var textViewHeight = CGRectGetHeight(textFieldView.frame)
- 
-            switch interfaceOrientation {
-            case UIInterfaceOrientation.LandscapeLeft, UIInterfaceOrientation.LandscapeRight:
-                textViewHeight = min(textViewHeight, (CGRectGetWidth(window.frame)-_kbSize.width-(topLayoutGuide+5)))
-            case UIInterfaceOrientation.Portrait, UIInterfaceOrientation.PortraitUpsideDown:
-                textViewHeight = min(textViewHeight, (CGRectGetHeight(window.frame)-_kbSize.height-(topLayoutGuide+5)))
-            default:    break
-            }
-            
-            UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve|UIViewAnimationOptions.BeginFromCurrentState), animations: { () -> Void in
+        if layoutGuidePosition == .Top {
 
-                self._IQShowLog("\(textFieldView._IQDescription()) Old Frame : \(textFieldView.frame)")
+            let constraint = textFieldView.viewController()!.IQLayoutGuideConstraint!
 
-                var textFieldViewRect = textFieldView.frame
-                textFieldViewRect.size.height = textViewHeight
-                textFieldView.frame = textFieldViewRect
-                self._isTextFieldViewFrameChanged = true
+            let constant = min(_layoutGuideConstraintInitialConstant, constraint.constant-move)
+            
+            UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve.union(UIViewAnimationOptions.BeginFromCurrentState)), animations: { () -> Void in
+                
+                constraint.constant = constant
+                self._rootViewController?.view.setNeedsLayout()
+                self._rootViewController?.view.layoutIfNeeded()
+                
+                }, completion: { (finished) -> Void in })
 
-                self._IQShowLog("\(textFieldView._IQDescription()) New Frame : \(textFieldView.frame)")
+        } else if layoutGuidePosition == .Bottom {
+            
+            let constraint = textFieldView.viewController()!.IQLayoutGuideConstraint!
 
-                }, completion: { (finished) -> Void in })
-        }
-        
-        //  Special case for iPad modalPresentationStyle.
-        if rootController.modalPresentationStyle == UIModalPresentationStyle.FormSheet || rootController.modalPresentationStyle == UIModalPresentationStyle.PageSheet {
+            let constant = max(_layoutGuideConstraintInitialConstant, constraint.constant+move)
             
-            _IQShowLog("Found Special case for Model Presentation Style: \(rootController.modalPresentationStyle)")
+            UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve.union(UIViewAnimationOptions.BeginFromCurrentState)), animations: { () -> Void in
+                
+                constraint.constant = constant
+                self._rootViewController?.view.setNeedsLayout()
+                self._rootViewController?.view.layoutIfNeeded()
+                
+                }, completion: { (finished) -> Void in })
 
-            //  Positive or zero.
-            if move >= 0 {
-                // We should only manipulate y.
-                rootViewRect.origin.y -= move
+        } else {
+            
+            //Special case for UITextView(Readjusting the move variable when textView hight is too big to fit on screen)
+            //_canAdjustTextView    If we have permission to adjust the textView, then let's do it on behalf of user  (Enhancement ID: #15)
+            //_lastScrollView       If not having inside any scrollView, (now contentInset manages the full screen textView.
+            //[_textFieldView isKindOfClass:[UITextView class]] If is a UITextView type
+            //_isTextFieldViewFrameChanged  If frame is not change by library in past  (Bug ID: #92)
+            if canAdjustTextView == true && _lastScrollView == nil && textFieldView is UITextView == true && _keyboardManagerFlags.isTextFieldViewFrameChanged == false {
+                var textViewHeight = CGRectGetHeight(textFieldView.frame)
+                textViewHeight = min(textViewHeight, (CGRectGetHeight(window.frame)-kbSize.height-(topLayoutGuide+5)))
                 
-                //  From now prevent keyboard manager to slide up the rootView to more than keyboard height. (Bug ID: #93)
-                if preventShowingBottomBlankSpace == true {
-                    var minimumY: CGFloat = 0
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve.union(UIViewAnimationOptions.BeginFromCurrentState)), animations: { () -> Void in
                     
-                    switch interfaceOrientation {
-                    case UIInterfaceOrientation.LandscapeLeft, UIInterfaceOrientation.LandscapeRight:
-                        minimumY = CGRectGetWidth(window.frame)-rootViewRect.size.height-topLayoutGuide-(_kbSize.width-keyboardDistanceFromTextField)
-                    case UIInterfaceOrientation.Portrait, UIInterfaceOrientation.PortraitUpsideDown:
-                        minimumY = (CGRectGetHeight(window.frame)-rootViewRect.size.height-topLayoutGuide)/2-(_kbSize.height-keyboardDistanceFromTextField)
-                    default:    break
-                    }
+                    self._IQShowLog("\(textFieldView._IQDescription()) Old Frame : \(textFieldView.frame)")
                     
-                    rootViewRect.origin.y = max(CGRectGetMinY(rootViewRect), minimumY)
-                }
+                    var textFieldViewRect = textFieldView.frame
+                    textFieldViewRect.size.height = textViewHeight
+                    textFieldView.frame = textFieldViewRect
+                    self._keyboardManagerFlags.isTextFieldViewFrameChanged = true
+                    
+                    self._IQShowLog("\(textFieldView._IQDescription()) New Frame : \(textFieldView.frame)")
+                    
+                    }, completion: { (finished) -> Void in })
+            }
+
+            //  Special case for iPad modalPresentationStyle.
+            if rootController.modalPresentationStyle == UIModalPresentationStyle.FormSheet || rootController.modalPresentationStyle == UIModalPresentationStyle.PageSheet {
                 
-                _IQShowLog("Moving Upward")
-                //  Setting adjusted rootViewRect
-                setRootViewFrame(rootViewRect)
-            } else {  //  Negative
-                //  Calculating disturbed distance. Pull Request #3
-                let disturbDistance = CGRectGetMinY(rootViewRect)-CGRectGetMinY(_topViewBeginRect)
+                _IQShowLog("Found Special case for Model Presentation Style: \(rootController.modalPresentationStyle)")
                 
-                //  disturbDistance Negative = frame disturbed.
-                //  disturbDistance positive = frame not disturbed.
-                if disturbDistance < 0 {
+                //  +Positive or zero.
+                if move >= 0 {
                     // We should only manipulate y.
-                    rootViewRect.origin.y -= max(move, disturbDistance)
-
-                    _IQShowLog("Moving Downward")
+                    rootViewRect.origin.y -= move
+                    
+                    //  From now prevent keyboard manager to slide up the rootView to more than keyboard height. (Bug ID: #93)
+                    if preventShowingBottomBlankSpace == true {
+                        let minimumY: CGFloat = (CGRectGetHeight(window.frame)-rootViewRect.size.height-topLayoutGuide)/2-(kbSize.height-newKeyboardDistanceFromTextField)
+                        
+                        rootViewRect.origin.y = max(CGRectGetMinY(rootViewRect), minimumY)
+                    }
+                    
+                    _IQShowLog("Moving Upward")
                     //  Setting adjusted rootViewRect
                     setRootViewFrame(rootViewRect)
-                }
-            }
-        } else {  //If presentation style is neither UIModalPresentationFormSheet nor UIModalPresentationPageSheet then going ahead.(General case)
-            //  Positive or zero.
-            if move >= 0 {
-
-                switch interfaceOrientation {
-                case UIInterfaceOrientation.LandscapeLeft:       rootViewRect.origin.x -= move
-                case UIInterfaceOrientation.LandscapeRight:      rootViewRect.origin.x += move
-                case UIInterfaceOrientation.Portrait:            rootViewRect.origin.y -= move
-                case UIInterfaceOrientation.PortraitUpsideDown:  rootViewRect.origin.y += move
-                default:    break
-                }
-                
-                //  From now prevent keyboard manager to slide up the rootView to more than keyboard height. (Bug ID: #93)
-                if preventShowingBottomBlankSpace == true {
+                } else {  //  -Negative
+                    //  Calculating disturbed distance. Pull Request #3
+                    let disturbDistance = CGRectGetMinY(rootViewRect)-CGRectGetMinY(_topViewBeginRect)
                     
-                    switch interfaceOrientation {
-                    case UIInterfaceOrientation.LandscapeLeft:
-                        rootViewRect.origin.x = max(rootViewRect.origin.x, min(0, -_kbSize.width+keyboardDistanceFromTextField))
-                    case UIInterfaceOrientation.LandscapeRight:
-                        rootViewRect.origin.x = min(rootViewRect.origin.x, +_kbSize.width-keyboardDistanceFromTextField)
-                    case UIInterfaceOrientation.Portrait:
-                        rootViewRect.origin.y = max(rootViewRect.origin.y, min(0, -_kbSize.height+keyboardDistanceFromTextField))
-                    case UIInterfaceOrientation.PortraitUpsideDown:
-                        rootViewRect.origin.y = min(rootViewRect.origin.y, +_kbSize.height-keyboardDistanceFromTextField)
-                    default:    break
+                    //  disturbDistance Negative = frame disturbed.
+                    //  disturbDistance positive = frame not disturbed.
+                    if disturbDistance < 0 {
+                        // We should only manipulate y.
+                        rootViewRect.origin.y -= max(move, disturbDistance)
+                        
+                        _IQShowLog("Moving Downward")
+                        //  Setting adjusted rootViewRect
+                        setRootViewFrame(rootViewRect)
                     }
                 }
+            } else {  //If presentation style is neither UIModalPresentationFormSheet nor UIModalPresentationPageSheet then going ahead.(General case)
+                //  +Positive or zero.
+                if move >= 0 {
+                    
+                    rootViewRect.origin.y -= move
 
-                _IQShowLog("Moving Upward")
-                //  Setting adjusted rootViewRect
-                setRootViewFrame(rootViewRect)
-            } else {  //  Negative
-                var disturbDistance : CGFloat = 0
-                
-                switch interfaceOrientation {
-                case UIInterfaceOrientation.LandscapeLeft:
-                    disturbDistance = CGRectGetMinX(rootViewRect)-CGRectGetMinX(_topViewBeginRect)
-                case UIInterfaceOrientation.LandscapeRight:
-                    disturbDistance = CGRectGetMinX(_topViewBeginRect)-CGRectGetMinX(rootViewRect)
-                case UIInterfaceOrientation.Portrait:
-                    disturbDistance = CGRectGetMinY(rootViewRect)-CGRectGetMinY(_topViewBeginRect)
-                case UIInterfaceOrientation.PortraitUpsideDown:
-                    disturbDistance = CGRectGetMinY(_topViewBeginRect)-CGRectGetMinY(rootViewRect)
-                default:    break
-                }
-                
-                //  disturbDistance Negative = frame disturbed.
-                //  disturbDistance positive = frame not disturbed.
-                if disturbDistance < 0 {
-
-                    switch interfaceOrientation {
-                    case UIInterfaceOrientation.LandscapeLeft:       rootViewRect.origin.x -= max(move, disturbDistance)
-                    case UIInterfaceOrientation.LandscapeRight:      rootViewRect.origin.x += max(move, disturbDistance)
-                    case UIInterfaceOrientation.Portrait:            rootViewRect.origin.y -= max(move, disturbDistance)
-                    case UIInterfaceOrientation.PortraitUpsideDown:  rootViewRect.origin.y += max(move, disturbDistance)
-                    default:    break
+                    //  From now prevent keyboard manager to slide up the rootView to more than keyboard height. (Bug ID: #93)
+                    if preventShowingBottomBlankSpace == true {
+                        
+                        rootViewRect.origin.y = max(rootViewRect.origin.y, min(0, -kbSize.height+newKeyboardDistanceFromTextField))
                     }
-
-                    _IQShowLog("Moving Downward")
-                    //  Setting adjusted rootViewRect
+                    
+                    _IQShowLog("Moving Upward")
                     //  Setting adjusted rootViewRect
                     setRootViewFrame(rootViewRect)
+                } else {  //  -Negative
+                    let disturbDistance : CGFloat = CGRectGetMinY(rootViewRect)-CGRectGetMinY(_topViewBeginRect)
+                    
+                    //  disturbDistance Negative = frame disturbed.
+                    //  disturbDistance positive = frame not disturbed.
+                    if disturbDistance < 0 {
+                        
+                        rootViewRect.origin.y -= max(move, disturbDistance)
+                        
+                        _IQShowLog("Moving Downward")
+                        //  Setting adjusted rootViewRect
+                        //  Setting adjusted rootViewRect
+                        setRootViewFrame(rootViewRect)
+                    }
                 }
             }
         }
+
         _IQShowLog("****** \(__FUNCTION__) ended ******")
     }
     
-    
     ///-------------------------------
     /// MARK: UIKeyboard Notifications
     ///-------------------------------
 
     /*  UIKeyboardWillShowNotification. */
-    func keyboardWillShow(notification : NSNotification?) -> Void {
+    internal func keyboardWillShow(notification : NSNotification?) -> Void {
         
         _kbShowNotification = notification
 
@@ -1142,7 +1161,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
 
         //Due to orientation callback we need to resave it's original frame.    //  (Bug ID: #46)
         //Added _isTextFieldViewFrameChanged check. Saving textFieldView current frame to use it with canAdjustTextView if textViewFrame has already not been changed. (Bug ID: #92)
-        if _isTextFieldViewFrameChanged == false {
+        if _keyboardManagerFlags.isTextFieldViewFrameChanged == false && _textFieldView != nil {
             if let textFieldView = _textFieldView {
                 _textFieldViewIntialFrame = textFieldView.frame
                 _IQShowLog("Saving \(textFieldView._IQDescription()) Initial frame : \(_textFieldViewIntialFrame)")
@@ -1152,12 +1171,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         //  (Bug ID: #5)
         if CGRectEqualToRect(_topViewBeginRect, CGRectZero) == true {
             //  keyboard is not showing(At the beginning only). We should save rootViewRect.
-            var rootController = _textFieldView?.topMostController()
-            if rootController == nil {
-                rootController = keyWindow()?.topMostController()
+            _rootViewController = _textFieldView?.topMostController()
+            if _rootViewController == nil {
+                _rootViewController = keyWindow()?.topMostController()
             }
             
-            if let unwrappedRootController = rootController {
+            if let unwrappedRootController = _rootViewController {
                 _topViewBeginRect = unwrappedRootController.view.frame
                 _IQShowLog("Saving \(unwrappedRootController._IQDescription()) beginning Frame: \(_topViewBeginRect)")
             } else {
@@ -1189,7 +1208,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             }
             
             //  Getting UIKeyboardSize.
-            if let kbFrame = info[UIKeyboardFrameEndUserInfoKey]?.CGRectValue() {
+            if let kbFrame = info[UIKeyboardFrameEndUserInfoKey]?.CGRectValue {
                 _kbSize = kbFrame.size
                 
                 _IQShowLog("UIKeyboard Size : \(_kbSize)")
@@ -1203,23 +1222,6 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             topMostController = keyWindow()?.topMostController()
         }
 
-        if let topController = topMostController {
-            //If it's iOS8 then we should do calculations according to portrait orientations.   //  (Bug ID: #64, #66)
-            let interfaceOrientation = (IQ_IS_IOS8_OR_GREATER) ? UIInterfaceOrientation.Portrait : topController.interfaceOrientation
-            
-            let _keyboardDistanceFromTextField = keyboardDistanceFromTextField
-            //    let _keyboardDistanceFromTextField = (_textFieldView.keyboardDistanceFromTextField == kIQUseDefaultKeyboardDistance)?_keyboardDistanceFromTextField:_textFieldView.keyboardDistanceFromTextField
-            
-            // Adding Keyboard distance from textField.
-            switch interfaceOrientation {
-            case UIInterfaceOrientation.LandscapeLeft, UIInterfaceOrientation.LandscapeRight:
-                _kbSize.width += _keyboardDistanceFromTextField
-            case UIInterfaceOrientation.Portrait, UIInterfaceOrientation.PortraitUpsideDown:
-                _kbSize.height += _keyboardDistanceFromTextField
-            default:    break
-            }
-        }
-        
         //If last restored keyboard size is different(any orientation accure), then refresh. otherwise not.
         if CGSizeEqualToSize(_kbSize, oldKBSize) == false {
             
@@ -1234,10 +1236,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                     
                     for disabledClassString in _disabledClasses {
                         
-                        //If viewController is kind of disabled viewController class, then ignoring to adjust view.
-                        if textFieldViewController.isKindOfClass((NSClassFromString(disabledClassString as! String))) {
-                            shouldIgnore = true
-                            break
+                        if let disabledClass = NSClassFromString(disabledClassString) {
+                            //If viewController is kind of disabled viewController class, then ignoring to adjust view.
+                            if textFieldViewController.isKindOfClass(disabledClass) {
+                                shouldIgnore = true
+                                break
+                            }
                         }
                     }
                     
@@ -1254,7 +1258,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     }
     
     /*  UIKeyboardWillHideNotification. So setting rootViewController to it's default frame. */
-    func keyboardWillHide(notification : NSNotification?) -> Void {
+    internal func keyboardWillHide(notification : NSNotification?) -> Void {
         
         //If it's not a fake notification generated by [self setEnable:NO].
         if notification != nil {
@@ -1273,7 +1277,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         //    if (_textFieldView == nil)   return
 
         //  Boolean to know keyboard is showing/hiding
-        _isKeyboardShowing = false
+        _keyboardManagerFlags.isKeyboardShowing = false
         
         let info : [NSObject : AnyObject]? = notification?.userInfo
         
@@ -1288,12 +1292,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         //Restoring the contentOffset of the lastScrollView
         if let lastScrollView = _lastScrollView {
             
-            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                 
                 lastScrollView.contentInset = self._startingContentInsets
                 lastScrollView.scrollIndicatorInsets = self._startingScrollIndicatorInsets
                 
-                if self.shouldRestoreScrollViewContentOffset == true {
+                if lastScrollView.shouldRestoreScrollViewContentOffset == true {
                     lastScrollView.contentOffset = self._startingContentOffset
                 }
                 
@@ -1301,8 +1305,8 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
 
                 // TODO: restore scrollView state
                 // This is temporary solution. Have to implement the save and restore scrollView state
-                var superScrollView = self._lastScrollView?.superviewOfClassType(UIScrollView) as? UIScrollView
-                
+                var superScrollView : UIScrollView? = lastScrollView
+
                 while let scrollView = superScrollView {
 
                     let contentSize = CGSizeMake(max(scrollView.contentSize.width, CGRectGetWidth(scrollView.frame)), max(scrollView.contentSize.height, CGRectGetHeight(scrollView.frame)))
@@ -1315,7 +1319,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                         self._IQShowLog("Restoring \(scrollView._IQDescription()) contentOffset to : \(self._startingContentOffset)")
                     }
                     
-                    superScrollView = superScrollView?.superviewOfClassType(UIScrollView) as? UIScrollView
+                    superScrollView = scrollView.superviewOfClassType(UIScrollView) as? UIScrollView
                 }
                 }) { (finished) -> Void in }
         }
@@ -1326,25 +1330,51 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             if let rootViewController = _rootViewController {
                 
                 //frame size needs to be adjusted on iOS8 due to orientation API changes.
-                if IQ_IS_IOS8_OR_GREATER == true {
-                    _topViewBeginRect.size = rootViewController.view.frame.size
-                }
+                _topViewBeginRect.size = rootViewController.view.frame.size
                 
                 //Used UIViewAnimationOptionBeginFromCurrentState to minimize strange animations.
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                     
-                    self._IQShowLog("Restoring \(rootViewController._IQDescription()) frame to : \(self._topViewBeginRect)")
+                    var hasDoneTweakLayoutGuide = false
                     
-                    //  Setting it's new frame
-                    rootViewController.view.frame = self._topViewBeginRect
-                    
-                    //Animating content if needed (Bug ID: #204)
-                    if self.layoutIfNeededOnUpdate == true {
-                        //Animating content (Bug ID: #160)
-                        rootViewController.view.setNeedsLayout()
-                        rootViewController.view.layoutIfNeeded()
+                    if let viewController = self._textFieldView?.viewController() {
+                        
+                        if let constraint = viewController.IQLayoutGuideConstraint {
+                            
+                            var layoutGuide : UILayoutSupport?
+                            if let itemLayoutGuide = constraint.firstItem as? UILayoutSupport {
+                                layoutGuide = itemLayoutGuide
+                            } else if let itemLayoutGuide = constraint.secondItem as? UILayoutSupport {
+                                layoutGuide = itemLayoutGuide
+                            }
+                            
+                            if let itemLayoutGuide : UILayoutSupport = layoutGuide {
+                                
+                                if (itemLayoutGuide === viewController.topLayoutGuide || itemLayoutGuide === viewController.bottomLayoutGuide)
+                                {
+                                    constraint.constant = self._layoutGuideConstraintInitialConstant
+                                    rootViewController.view.setNeedsLayout()
+                                    rootViewController.view.layoutIfNeeded()
+
+                                    hasDoneTweakLayoutGuide = true
+                                }
+                            }
+                        }
                     }
                     
+                    if hasDoneTweakLayoutGuide == false {
+                        self._IQShowLog("Restoring \(rootViewController._IQDescription()) frame to : \(self._topViewBeginRect)")
+                        
+                        //  Setting it's new frame
+                        rootViewController.view.frame = self._topViewBeginRect
+                        
+                        //Animating content if needed (Bug ID: #204)
+                        if self.layoutIfNeededOnUpdate == true {
+                            //Animating content (Bug ID: #160)
+                            rootViewController.view.setNeedsLayout()
+                            rootViewController.view.layoutIfNeeded()
+                        }
+                    }
                     }) { (finished) -> Void in }
                 
                 _rootViewController = nil
@@ -1362,8 +1392,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         _IQShowLog("****** \(__FUNCTION__) ended ******")
     }
 
-    
-    func keyboardDidHide(notification:NSNotification) {
+    internal func keyboardDidHide(notification:NSNotification) {
 
         _IQShowLog("****** \(__FUNCTION__) started ******")
         
@@ -1377,7 +1406,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     ///-------------------------------------------
 
     /**  UITextFieldTextDidBeginEditingNotification, UITextViewTextDidBeginEditingNotification. Fetching UITextFieldView object. */
-    func textFieldViewDidBeginEditing(notification:NSNotification) {
+    internal func textFieldViewDidBeginEditing(notification:NSNotification) {
 
         _IQShowLog("****** \(__FUNCTION__) started ******")
 
@@ -1405,7 +1434,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         // Saving textFieldView current frame to use it with canAdjustTextView if textViewFrame has already not been changed.
         //Added _isTextFieldViewFrameChanged check. (Bug ID: #92)
-        if _isTextFieldViewFrameChanged == false {
+        if _keyboardManagerFlags.isTextFieldViewFrameChanged == false {
             if let textFieldView = _textFieldView {
                 _textFieldViewIntialFrame = textFieldView.frame
                 _IQShowLog("Saving \(textFieldView._IQDescription()) Initial frame : \(_textFieldViewIntialFrame)")
@@ -1420,12 +1449,22 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             //UITextView special case. Keyboard Notification is firing before textView notification so we need to resign it first and then again set it as first responder to add toolbar on it.
             if _textFieldView is UITextView == true && _textFieldView?.inputAccessoryView == nil {
                 
-                UIView.animateWithDuration(0.00001, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(0.00001, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
 
                     self.addToolbarIfRequired()
                     
                     }, completion: { (finished) -> Void in
 
+                        //RestoringTextView before reloading inputViews
+                        if (self._keyboardManagerFlags.isTextFieldViewFrameChanged)
+                        {
+                            self._keyboardManagerFlags.isTextFieldViewFrameChanged = false
+                            
+                            if let textFieldView = self._textFieldView {
+                                textFieldView.frame = self._textFieldViewIntialFrame
+                            }
+                        }
+
                         //On textView toolbar didn't appear on first time, so forcing textView to reload it's inputViews.
                         self._textFieldView?.reloadInputViews()
                 })
@@ -1442,9 +1481,13 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         _textFieldView?.window?.addGestureRecognizer(_tapGesture)    //   (Enhancement ID: #14)
 
-        if _isKeyboardShowing == false {    //  (Bug ID: #5)
+        if _keyboardManagerFlags.isKeyboardShowing == false {    //  (Bug ID: #5)
 
             //  keyboard is not showing(At the beginning only). We should save rootViewRect.
+            if let constant = _textFieldView?.viewController()?.IQLayoutGuideConstraint?.constant {
+                _layoutGuideConstraintInitialConstant = constant
+            }
+
             _rootViewController = _textFieldView?.topMostController()
             if _rootViewController == nil {
                 _rootViewController = keyWindow()?.topMostController()
@@ -1469,10 +1512,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 
                 for disabledClassString in _disabledClasses {
                     
-                    //If viewController is kind of disabled viewController class, then ignoring to adjust view.
-                    if textFieldViewController.isKindOfClass((NSClassFromString(disabledClassString as! String))) {
-                        shouldIgnore = true
-                        break
+                    if let disabledClass = NSClassFromString(disabledClassString) {
+                        //If viewController is kind of disabled viewController class, then ignoring to adjust view.
+                        if textFieldViewController.isKindOfClass(disabledClass) {
+                            shouldIgnore = true
+                            break
+                        }
                     }
                 }
                 
@@ -1488,7 +1533,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     }
     
     /**  UITextFieldTextDidEndEditingNotification, UITextViewTextDidEndEditingNotification. Removing fetched object. */
-    func textFieldViewDidEndEditing(notification:NSNotification) {
+    internal func textFieldViewDidEndEditing(notification:NSNotification) {
         
         _IQShowLog("****** \(__FUNCTION__) started ******")
 
@@ -1496,9 +1541,9 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         _textFieldView?.window?.removeGestureRecognizer(_tapGesture)
         
         // We check if there's a change in original frame or not.
-        if _isTextFieldViewFrameChanged == true {
-            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
-                self._isTextFieldViewFrameChanged = false
+        if _keyboardManagerFlags.isTextFieldViewFrameChanged == true {
+            UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
+                self._keyboardManagerFlags.isTextFieldViewFrameChanged = false
                 
                 self._IQShowLog("Restoring \(self._textFieldView?._IQDescription()) frame to : \(self._textFieldViewIntialFrame)")
 
@@ -1513,12 +1558,12 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     }
 
     /** UITextViewTextDidChangeNotificationBug,  fix for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string */
-    func textFieldViewDidChange(notification:NSNotification) {  //  (Bug ID: #18)
+    internal func textFieldViewDidChange(notification:NSNotification) {  //  (Bug ID: #18)
         
         if  shouldFixTextViewClip {
             let textView = notification.object as! UITextView
             
-            let line = textView .caretRectForPosition(textView.selectedTextRange?.start)
+            let line = textView.caretRectForPosition((textView.selectedTextRange?.start)!)
             
             let overflow = CGRectGetMaxY(line) - (textView.contentOffset.y + CGRectGetHeight(textView.bounds) - textView.contentInset.bottom - textView.contentInset.top)
             
@@ -1530,29 +1575,28 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 offset.y += overflow + 7 // leave 7 pixels margin
                 
                 // Cannot animate with setContentOffset:animated: or caret will not appear
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState|_animationCurve, animations: { () -> Void in
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                     textView.contentOffset = offset
                     }, completion: { (finished) -> Void in })
             }
         }
     }
 
-    
     ///------------------------------------------
     /// MARK: Interface Orientation Notifications
     ///------------------------------------------
     
     /**  UIApplicationWillChangeStatusBarOrientationNotification. Need to set the textView to it's original position. If any frame changes made. (Bug ID: #92)*/
-    func willChangeStatusBarOrientation(notification:NSNotification) {
+    internal func willChangeStatusBarOrientation(notification:NSNotification) {
         
         _IQShowLog("****** \(__FUNCTION__) started ******")
         
         //If textFieldViewInitialRect is saved then restore it.(UITextView case @canAdjustTextView)
-        if _isTextFieldViewFrameChanged == true {
+        if _keyboardManagerFlags.isTextFieldViewFrameChanged == true {
             if let textFieldView = _textFieldView {
                 //Due to orientation callback we need to set it's original position.
-                UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve|UIViewAnimationOptions.BeginFromCurrentState), animations: { () -> Void in
-                    self._isTextFieldViewFrameChanged = false
+                UIView.animateWithDuration(_animationDuration, delay: 0, options: (_animationCurve.union(UIViewAnimationOptions.BeginFromCurrentState)), animations: { () -> Void in
+                    self._keyboardManagerFlags.isTextFieldViewFrameChanged = false
 
                     self._IQShowLog("Restoring \(textFieldView._IQDescription()) frame to : \(self._textFieldViewIntialFrame)")
                     
@@ -1566,22 +1610,26 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         _IQShowLog("****** \(__FUNCTION__) ended ******")
     }
     
-    
     ///------------------
     /// MARK: AutoToolbar
     ///------------------
     
     /**	Get all UITextField/UITextView siblings of textFieldView. */
-    func responderViews()-> NSArray? {
+    private func responderViews()-> [UIView]? {
         
         var superConsideredView : UIView?
 
         //If find any consider responderView in it's upper hierarchy then will get deepResponderView.
         for disabledClassString in _toolbarPreviousNextConsideredClass {
             
-                if _textFieldView?.superviewOfClassType(NSClassFromString(disabledClassString as! String)) != nil {
+            if let disabledClass = NSClassFromString(disabledClassString) {
+                
+                superConsideredView = _textFieldView?.superviewOfClassType(disabledClass)
+                
+                if superConsideredView != nil {
                     break
                 }
+            }
         }
     
     //If there is a superConsideredView in view's hierarchy, then fetching all it's subview that responds. No sorting for superConsideredView, it's by subView position.    (Enhancement ID: #22)
@@ -1615,10 +1663,13 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             
             for disabledClassString in _disabledToolbarClasses {
                 
-                if textFieldViewController.isKindOfClass((NSClassFromString(disabledClassString as! String))) {
+                if let disabledClass = NSClassFromString(disabledClassString) {
                     
-                    removeToolbarIfRequired()
-                    return
+                    if textFieldViewController.isKindOfClass(disabledClass) {
+                        
+                        removeToolbarIfRequired()
+                        return
+                    }
                 }
             }
         }
@@ -1628,17 +1679,28 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             
             //	If only one object is found, then adding only Done button.
             if siblings.count == 1 {
-                let textField = siblings.firstObject as! UIView
+                let textField = siblings[0]
                 
                 //Either there is no inputAccessoryView or if accessoryView is not appropriate for current situation(There is Previous/Next/Done toolbar).
-                if textField.inputAccessoryView == nil || textField.inputAccessoryView?.tag == kIQPreviousNextButtonToolbarTag {
+                //setInputAccessoryView: check   (Bug ID: #307)
+                if textField.respondsToSelector(Selector("setInputAccessoryView:")) && (textField.inputAccessoryView == nil || textField.inputAccessoryView?.tag == IQKeyboardManager.kIQPreviousNextButtonToolbarTag) {
                     
-                    //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
-                    textField.addDoneOnKeyboardWithTarget(self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
-                    textField.inputAccessoryView?.tag = kIQDoneButtonToolbarTag //  (Bug ID: #78)
+                    //Supporting Custom Done button image (Enhancement ID: #366)
+                    if let doneBarButtonItemImage = toolbarDoneBarButtonItemImage {
+                            textField.addRightButtonOnKeyboardWithImage(doneBarButtonItemImage, target: self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                    }
+                    //Supporting Custom Done button text (Enhancement ID: #209, #411, Bug ID: #376)
+                    else if let doneBarButtonItemText = toolbarDoneBarButtonItemText {
+                        textField.addRightButtonOnKeyboardWithText(doneBarButtonItemText, target: self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                    } else {
+                        //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
+                        textField.addDoneOnKeyboardWithTarget(self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                    }
+
+                    textField.inputAccessoryView?.tag = IQKeyboardManager.kIQDoneButtonToolbarTag //  (Bug ID: #78)
                 }
                 
-                if textField.inputAccessoryView?.isKindOfClass(IQToolbar) == true && textField.inputAccessoryView?.tag == kIQDoneButtonToolbarTag {
+                if textField.inputAccessoryView is IQToolbar && textField.inputAccessoryView?.tag == IQKeyboardManager.kIQDoneButtonToolbarTag {
                     
                     let toolbar = textField.inputAccessoryView as! IQToolbar
                     
@@ -1653,7 +1715,15 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             toolbar.tintColor = UIColor.whiteColor()
                         default:
                             toolbar.barStyle = UIBarStyle.Default
-                            toolbar.tintColor = shouldToolbarUsesTextFieldTintColor ? _textField.tintColor : _defaultToolbarTintColor
+                            
+                            //Setting toolbar tintColor //  (Enhancement ID: #30)
+                            if shouldToolbarUsesTextFieldTintColor {
+                                toolbar.tintColor = _textField.tintColor
+                            } else if let tintColor = toolbarTintColor {
+                                toolbar.tintColor = tintColor
+                            } else {
+                                toolbar.tintColor = UIColor.blackColor()
+                            }
                         }
                     } else if let _textView = textField as? UITextView {
 
@@ -1665,49 +1735,70 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                             toolbar.tintColor = UIColor.whiteColor()
                         default:
                             toolbar.barStyle = UIBarStyle.Default
-                            toolbar.tintColor = shouldToolbarUsesTextFieldTintColor ? _textView.tintColor : _defaultToolbarTintColor
+                            
+                            if shouldToolbarUsesTextFieldTintColor {
+                                toolbar.tintColor = _textView.tintColor
+                            } else if let tintColor = toolbarTintColor {
+                                toolbar.tintColor = tintColor
+                            } else {
+                                toolbar.tintColor = UIColor.blackColor()
+                            }
                         }
                     }
 
                     //Setting toolbar title font.   //  (Enhancement ID: #30)
-                    if shouldShowTextFieldPlaceholder == true && placeholderFont != nil {
+                    if shouldShowTextFieldPlaceholder == true && textField.shouldHideTitle == false {
                         
-                        let toolbar = textField.inputAccessoryView as! IQToolbar
-
                         //Updating placeholder font to toolbar.     //(Bug ID: #148)
                         if let _textField = textField as? UITextField {
                             
-                            if toolbar.title != _textField.placeholder {
+                            if toolbar.title == nil || toolbar.title != _textField.placeholder {
                                 toolbar.title = _textField.placeholder
                             }
 
                         } else if let _textView = textField as? IQTextView {
                             
-                            if toolbar.title != _textView.placeholder {
+                            if toolbar.title == nil || toolbar.title != _textView.placeholder {
                                 toolbar.title = _textView.placeholder
                             }
+                        } else {
+                            toolbar.title = nil
                         }
 
                         //Setting toolbar title font.   //  (Enhancement ID: #30)
                         if placeholderFont != nil {
                             toolbar.titleFont = placeholderFont
                         }
+                    } else {
+                        
+                        toolbar.title = nil
                     }
                 }
             } else if siblings.count != 0 {
                 
                 //	If more than 1 textField is found. then adding previous/next/done buttons on it.
-                for textField in siblings as! [UIView] {
+                for textField in siblings {
                     
                     //Either there is no inputAccessoryView or if accessoryView is not appropriate for current situation(There is Done toolbar).
-                    if textField.inputAccessoryView == nil || textField.inputAccessoryView?.tag == kIQDoneButtonToolbarTag {
+                    //setInputAccessoryView: check   (Bug ID: #307)
+                    if textField.respondsToSelector(Selector("setInputAccessoryView:")) && (textField.inputAccessoryView == nil || textField.inputAccessoryView?.tag == IQKeyboardManager.kIQDoneButtonToolbarTag) {
                         
-                        //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
-                        textField.addPreviousNextDoneOnKeyboardWithTarget(self, previousAction: "previousAction:", nextAction: "nextAction:", doneAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
-                        textField.inputAccessoryView?.tag = kIQPreviousNextButtonToolbarTag //  (Bug ID: #78)
+                        //Supporting Custom Done button image (Enhancement ID: #366)
+                        if let doneBarButtonItemImage = toolbarDoneBarButtonItemImage {
+                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonImage: doneBarButtonItemImage, previousAction: "previousAction:", nextAction: "nextAction:", rightButtonAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                        }
+                        //Supporting Custom Done button text (Enhancement ID: #209, #411, Bug ID: #376)
+                        else if let doneBarButtonItemText = toolbarDoneBarButtonItemText {
+                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonTitle: doneBarButtonItemText, previousAction: "previousAction:", nextAction: "nextAction:", rightButtonAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                        } else {
+                            //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
+                            textField.addPreviousNextDoneOnKeyboardWithTarget(self, previousAction: "previousAction:", nextAction: "nextAction:", doneAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                        }
+
+                        textField.inputAccessoryView?.tag = IQKeyboardManager.kIQPreviousNextButtonToolbarTag //  (Bug ID: #78)
                    }
                     
-                    if textField.inputAccessoryView?.isKindOfClass(IQToolbar) == true && textField.inputAccessoryView?.tag == kIQPreviousNextButtonToolbarTag {
+                    if textField.inputAccessoryView is IQToolbar && textField.inputAccessoryView?.tag == IQKeyboardManager.kIQPreviousNextButtonToolbarTag {
                         
                         let toolbar = textField.inputAccessoryView as! IQToolbar
                         
@@ -1722,7 +1813,14 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                                 toolbar.tintColor = UIColor.whiteColor()
                             default:
                                 toolbar.barStyle = UIBarStyle.Default
-                                toolbar.tintColor = shouldToolbarUsesTextFieldTintColor ? _textField.tintColor : _defaultToolbarTintColor
+
+                                if shouldToolbarUsesTextFieldTintColor {
+                                    toolbar.tintColor = _textField.tintColor
+                                } else if let tintColor = toolbarTintColor {
+                                    toolbar.tintColor = tintColor
+                                } else {
+                                    toolbar.tintColor = UIColor.blackColor()
+                                }
                             }
                         } else if let _textView = textField as? UITextView {
                             
@@ -1734,27 +1832,34 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                                 toolbar.tintColor = UIColor.whiteColor()
                             default:
                                 toolbar.barStyle = UIBarStyle.Default
-                                toolbar.tintColor = shouldToolbarUsesTextFieldTintColor ? _textView.tintColor : _defaultToolbarTintColor
+
+                                if shouldToolbarUsesTextFieldTintColor {
+                                    toolbar.tintColor = _textView.tintColor
+                                } else if let tintColor = toolbarTintColor {
+                                    toolbar.tintColor = tintColor
+                                } else {
+                                    toolbar.tintColor = UIColor.blackColor()
+                                }
                             }
                         }
                         
                         //Setting toolbar title font.   //  (Enhancement ID: #30)
-                        if shouldShowTextFieldPlaceholder == true && placeholderFont != nil {
-                            
-                            let toolbar = textField.inputAccessoryView as! IQToolbar
+                        if shouldShowTextFieldPlaceholder == true && textField.shouldHideTitle == false {
                             
                             //Updating placeholder font to toolbar.     //(Bug ID: #148)
                             if let _textField = textField as? UITextField {
                                 
-                                if toolbar.title != _textField.placeholder {
+                                if toolbar.title == nil || toolbar.title != _textField.placeholder {
                                     toolbar.title = _textField.placeholder
                                 }
                                 
                             } else if let _textView = textField as? IQTextView {
                                 
-                                if toolbar.title != _textView.placeholder {
+                                if toolbar.title == nil || toolbar.title != _textView.placeholder {
                                     toolbar.title = _textView.placeholder
                                 }
+                            } else {
+                                toolbar.title = nil
                             }
                             
                             //Setting toolbar title font.   //  (Enhancement ID: #30)
@@ -1762,15 +1867,16 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                                 toolbar.titleFont = placeholderFont
                             }
                         }
-                    }
-                    
-                    //If the toolbar is added by IQKeyboardManager then automatically enabling/disabling the previous/next button.
-                    if textField.inputAccessoryView?.tag == kIQPreviousNextButtonToolbarTag {
+                        else {
+                            
+                            toolbar.title = nil
+                        }
+
                         //In case of UITableView (Special), the next/previous buttons has to be refreshed everytime.    (Bug ID: #56)
                         //	If firstTextField, then previous should not be enabled.
-                        if siblings[0] as! UIView == textField {
+                        if siblings[0] == textField {
                             textField.setEnablePrevious(false, isNextEnabled: true)
-                        } else if siblings.lastObject as! UIView  == textField {   //	If lastTextField then next should not be enaled.
+                        } else if siblings.last  == textField {   //	If lastTextField then next should not be enaled.
                             textField.setEnablePrevious(true, isNextEnabled: false)
                         } else {
                             textField.setEnablePrevious(true, isNextEnabled: true)
@@ -1787,18 +1893,18 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         //	Getting all the sibling textFields.
         if let siblings = responderViews() {
             
-            for view in siblings as! [UIView] {
+            for view in siblings {
                 
-                let toolbar = view.inputAccessoryView
-                
-                if toolbar is IQToolbar == true  && (toolbar?.tag == kIQDoneButtonToolbarTag || toolbar?.tag == kIQPreviousNextButtonToolbarTag) {
-                    
-                    if view is UITextField == true {
-                        let textField = view as! UITextField
-                        textField.inputAccessoryView = nil
-                    } else if view is UITextView == true {
-                        let textView = view as! UITextView
-                        textView.inputAccessoryView = nil
+                if let toolbar = view.inputAccessoryView as? IQToolbar {
+
+                    //setInputAccessoryView: check   (Bug ID: #307)
+                    if view.respondsToSelector(Selector("setInputAccessoryView:")) && (toolbar.tag == IQKeyboardManager.kIQDoneButtonToolbarTag || toolbar.tag == IQKeyboardManager.kIQPreviousNextButtonToolbarTag) {
+                        
+                        if let textField = view as? UITextField {
+                            textField.inputAccessoryView = nil
+                        } else if let textView = view as? UITextView {
+                            textView.inputAccessoryView = nil
+                        }
                     }
                 }
             }
diff --git a/Clutch/IQKeybordManagerSwift/IQKeyboardReturnKeyHandler.swift b/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
old mode 100644
new mode 100755
similarity index 74%
rename from Clutch/IQKeybordManagerSwift/IQKeyboardReturnKeyHandler.swift
rename to IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
index 735b63c..2906146
--- a/Clutch/IQKeybordManagerSwift/IQKeyboardReturnKeyHandler.swift
+++ b/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
@@ -1,7 +1,7 @@
 //
 //  IQKeyboardReturnKeyHandler.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ import UIKit
 /**
 Manages the return key to work like next/done in a view hierarchy.
 */
-class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDelegate {
+public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDelegate {
     
     
     ///---------------
@@ -37,23 +37,18 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     /**
     Delegate of textField/textView.
     */
-    var delegate: protocol<UITextFieldDelegate, UITextViewDelegate>?
-    
-    /**
-    It help to choose the lastTextField instance from sibling responderViews. Default is IQAutoToolbarBySubviews.
-    */
-    var toolbarManageBehaviour = IQAutoToolbarManageBehaviour.BySubviews
+    public var delegate: protocol<UITextFieldDelegate, UITextViewDelegate>?
     
     /**
     Set the last textfield return key type. Default is UIReturnKeyDefault.
     */
-    var lastTextFieldReturnKeyType : UIReturnKeyType = UIReturnKeyType.Default {
+    public var lastTextFieldReturnKeyType : UIReturnKeyType = UIReturnKeyType.Default {
         
         didSet {
             
             for infoDict in textFieldInfoCache {
                 
-                if let view = infoDict[kIQTextField] as? UIView {
+                if let view = infoDict.objectForKey(kIQTextField) as? UIView {
                     updateReturnKeyTypeOnTextField(view)
                 }
             }
@@ -64,14 +59,14 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     /// MARK: Initialization/Deinitialization
     ///--------------------------------------
 
-    override init() {
+    public override init() {
         super.init()
     }
     
     /**
     Add all the textFields available in UIViewController's view.
     */
-    init(controller : UIViewController) {
+    public init(controller : UIViewController) {
         super.init()
         
         addResponderFromView(controller.view)
@@ -81,12 +76,12 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         
         for infoDict in textFieldInfoCache {
             
-            let view : AnyObject = infoDict[kIQTextField]!!
+            let view : AnyObject = infoDict.objectForKey(kIQTextField)!
             
             if let textField = view as? UITextField {
                 
                 let returnKeyTypeValue = infoDict[kIQTextFieldReturnKeyType] as! NSNumber
-                textField.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.unsignedIntegerValue)!
+                textField.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.integerValue)!
                 
                 textField.delegate = infoDict[kIQTextFieldDelegate] as! UITextFieldDelegate?
             } else if let textView = view as? UITextView {
@@ -94,7 +89,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
                 textView.returnKeyType = UIReturnKeyType(rawValue: (infoDict[kIQTextFieldReturnKeyType] as! NSNumber).integerValue)!
                 
                 let returnKeyTypeValue = infoDict[kIQTextFieldReturnKeyType] as! NSNumber
-                textView.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.unsignedIntegerValue)!
+                textView.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.integerValue)!
                 
                 textView.delegate = infoDict[kIQTextFieldDelegate] as! UITextViewDelegate?
             }
@@ -107,7 +102,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     ///------------------------
     /// MARK: Private variables
     ///------------------------
-    private var textFieldInfoCache  = NSMutableSet()
+    private var textFieldInfoCache          =   NSMutableSet()
     private let kIQTextField                =   "kIQTextField"
     private let kIQTextFieldDelegate        =   "kIQTextFieldDelegate"
     private let kIQTextFieldReturnKeyType   =   "kIQTextFieldReturnKeyType"
@@ -120,7 +115,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         
         for infoDict in textFieldInfoCache {
             
-            if infoDict[kIQTextField] as! NSObject == textField {
+            if infoDict.objectForKey(kIQTextField) as! NSObject == textField {
                 return infoDict as? [String : AnyObject]
             }
         }
@@ -130,22 +125,32 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
 
     private func updateReturnKeyTypeOnTextField(view : UIView)
     {
-        var tableView : UIView? = view.superviewOfClassType(UITableView)
-        if tableView == nil {
-            tableView = tableView?.superviewOfClassType(UICollectionView)
-        }
+        var superConsideredView : UIView?
         
-        var textFields : NSArray?
+        //If find any consider responderView in it's upper hierarchy then will get deepResponderView. (Bug ID: #347)
+        for disabledClassString in IQKeyboardManager.sharedManager().consideredToolbarPreviousNextViewClassesString() {
+            
+            if let disabledClass = NSClassFromString(disabledClassString) {
+                
+                superConsideredView = view.superviewOfClassType(disabledClass)
+                
+                if superConsideredView != nil {
+                    break
+                }
+            }
+        }
+
+        var textFields : [UIView]?
         
         //If there is a tableView in view's hierarchy, then fetching all it's subview that responds.
-        if let unwrappedTableView = tableView {     //   (Enhancement ID: #22)
+        if let unwrappedTableView = superConsideredView {     //   (Enhancement ID: #22)
             textFields = unwrappedTableView.deepResponderViews()
         } else {  //Otherwise fetching all the siblings
             
             textFields = view.responderSiblings()
             
             //Sorting textFields according to behaviour
-            switch toolbarManageBehaviour {
+            switch IQKeyboardManager.sharedManager().toolbarManageBehaviour {
                 //If needs to sort it by tag
             case .ByTag:        textFields = textFields?.sortedArrayByTag()
                 //If needs to sort it by Position
@@ -154,7 +159,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
             }
         }
         
-        if let lastView = textFields?.lastObject as? UIView {
+        if let lastView = textFields?.last {
             
             if let textField = view as? UITextField {
                 
@@ -178,7 +183,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     
     @param textFieldView UITextField/UITextView object to register.
     */
-    func addTextFieldView(view : UIView) {
+    public func addTextFieldView(view : UIView) {
         
         var dictInfo : [String : AnyObject] = [String : AnyObject]()
         
@@ -212,20 +217,20 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     
     @param textFieldView UITextField/UITextView object to unregister.
     */
-    func removeTextFieldView(view : UIView) {
+    public func removeTextFieldView(view : UIView) {
         
         if let dict : [String : AnyObject] = textFieldCachedInfo(view) {
             
             if let textField = view as? UITextField {
                 
                 let returnKeyTypeValue = dict[kIQTextFieldReturnKeyType] as! NSNumber
-                textField.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.unsignedIntegerValue)!
+                textField.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.integerValue)!
                 
                 textField.delegate = dict[kIQTextFieldDelegate] as! UITextFieldDelegate?
             } else if let textView = view as? UITextView {
                 
                 let returnKeyTypeValue = dict[kIQTextFieldReturnKeyType] as! NSNumber
-                textView.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.unsignedIntegerValue)!
+                textView.returnKeyType = UIReturnKeyType(rawValue: returnKeyTypeValue.integerValue)!
                 
                 textView.delegate = dict[kIQTextFieldDelegate] as! UITextViewDelegate?
             }
@@ -239,11 +244,11 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     
     @param UIView object to register all it's responder subviews.
     */
-    func addResponderFromView(view : UIView) {
+    public func addResponderFromView(view : UIView) {
         
         let textFields = view.deepResponderViews()
         
-        for textField in textFields as! [UIView] {
+        for textField in textFields {
             
             addTextFieldView(textField)
         }
@@ -254,34 +259,44 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     
     @param UIView object to unregister all it's responder subviews.
     */
-    func removeResponderFromView(view : UIView) {
+    public func removeResponderFromView(view : UIView) {
         
         let textFields = view.deepResponderViews()
         
-        for textField in textFields as! [UIView] {
+        for textField in textFields {
             
             removeTextFieldView(textField)
         }
     }
     
-    func goToNextResponderOrResign(view : UIView) {
+    private func goToNextResponderOrResign(view : UIView) {
         
-        var tableView : UIView? = view.superviewOfClassType(UITableView)
-        if tableView == nil {
-            tableView = tableView?.superviewOfClassType(UICollectionView)
+        var superConsideredView : UIView?
+        
+        //If find any consider responderView in it's upper hierarchy then will get deepResponderView. (Bug ID: #347)
+        for disabledClassString in IQKeyboardManager.sharedManager().consideredToolbarPreviousNextViewClassesString() {
+            
+            if let disabledClass = NSClassFromString(disabledClassString) {
+                
+                superConsideredView = view.superviewOfClassType(disabledClass)
+                
+                if superConsideredView != nil {
+                    break
+                }
+            }
         }
-
-        var textFields : NSArray?
+        
+        var textFields : [UIView]?
         
         //If there is a tableView in view's hierarchy, then fetching all it's subview that responds.
-        if let unwrappedTableView = tableView {     //   (Enhancement ID: #22)
+        if let unwrappedTableView = superConsideredView {     //   (Enhancement ID: #22)
             textFields = unwrappedTableView.deepResponderViews()
         } else {  //Otherwise fetching all the siblings
             
             textFields = view.responderSiblings()
             
             //Sorting textFields according to behaviour
-            switch toolbarManageBehaviour {
+            switch IQKeyboardManager.sharedManager().toolbarManageBehaviour {
                 //If needs to sort it by tag
             case .ByTag:        textFields = textFields?.sortedArrayByTag()
                 //If needs to sort it by Position
@@ -293,17 +308,15 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
 
         if let unwrappedTextFields = textFields {
             
-            if unwrappedTextFields.containsObject(view) == true {
-                //Getting index of current textField.
-                let index = unwrappedTextFields.indexOfObject(view)
-                
+            //Getting index of current textField.
+            if let index = unwrappedTextFields.indexOf(view) {
                 //If it is not last textField. then it's next object becomeFirstResponder.
                 if index < (unwrappedTextFields.count - 1) {
                     
-                    let nextTextField = unwrappedTextFields[index+1] as! UIView
+                    let nextTextField = unwrappedTextFields[index+1]
                     nextTextField.becomeFirstResponder()
                 } else {
-
+                    
                     view.resignFirstResponder()
                 }
             }
@@ -315,7 +328,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     /// MARK: UITextField/UITextView delegates
     ///----------------------------------------------
     
-    func textFieldShouldBeginEditing(textField: UITextField) -> Bool {
+    public func textFieldShouldBeginEditing(textField: UITextField) -> Bool {
         
         if delegate?.respondsToSelector("textFieldShouldBeginEditing:") != nil {
             return (delegate?.textFieldShouldBeginEditing?(textField) == true)
@@ -324,7 +337,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         }
     }
     
-    func textFieldShouldEndEditing(textField: UITextField) -> Bool {
+    public func textFieldShouldEndEditing(textField: UITextField) -> Bool {
         
         if delegate?.respondsToSelector("textFieldShouldEndEditing:") != nil {
             return (delegate?.textFieldShouldEndEditing?(textField) == true)
@@ -333,18 +346,18 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         }
     }
     
-    func textFieldDidBeginEditing(textField: UITextField) {
+    public func textFieldDidBeginEditing(textField: UITextField) {
         updateReturnKeyTypeOnTextField(textField)
         
         delegate?.textFieldShouldBeginEditing?(textField)
     }
     
-    func textFieldDidEndEditing(textField: UITextField) {
+    public func textFieldDidEndEditing(textField: UITextField) {
         
         delegate?.textFieldDidEndEditing?(textField)
     }
     
-    func textField(textField: UITextField, shouldChangeCharactersInRange range: NSRange, replacementString string: String) -> Bool {
+    public func textField(textField: UITextField, shouldChangeCharactersInRange range: NSRange, replacementString string: String) -> Bool {
         
         if delegate?.respondsToSelector("textField:shouldChangeCharactersInRange:replacementString:") != nil {
             return (delegate?.textField?(textField, shouldChangeCharactersInRange: range, replacementString: string) == true)
@@ -353,7 +366,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         }
     }
     
-    func textFieldShouldClear(textField: UITextField) -> Bool {
+    public func textFieldShouldClear(textField: UITextField) -> Bool {
         
         if delegate?.respondsToSelector("textFieldShouldClear:") != nil {
             return (delegate?.textFieldShouldClear?(textField) == true)
@@ -363,7 +376,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     }
     
     
-    func textFieldShouldReturn(textField: UITextField) -> Bool {
+    public func textFieldShouldReturn(textField: UITextField) -> Bool {
         
         var shouldReturn = true
         
@@ -379,7 +392,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
     }
     
     
-    func textViewShouldBeginEditing(textView: UITextView) -> Bool {
+    public func textViewShouldBeginEditing(textView: UITextView) -> Bool {
         
         if delegate?.respondsToSelector("textViewShouldBeginEditing:") != nil {
             return (delegate?.textViewShouldBeginEditing?(textView) == true)
@@ -388,7 +401,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         }
     }
     
-    func textViewShouldEndEditing(textView: UITextView) -> Bool {
+    public func textViewShouldEndEditing(textView: UITextView) -> Bool {
         
         if delegate?.respondsToSelector("textViewShouldEndEditing:") != nil {
             return (delegate?.textViewShouldEndEditing?(textView) == true)
@@ -397,18 +410,18 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         }
     }
     
-    func textViewDidBeginEditing(textView: UITextView) {
+    public func textViewDidBeginEditing(textView: UITextView) {
         updateReturnKeyTypeOnTextField(textView)
         
         delegate?.textViewDidBeginEditing?(textView)
     }
     
-    func textViewDidEndEditing(textView: UITextView) {
+    public func textViewDidEndEditing(textView: UITextView) {
         
         delegate?.textViewDidEndEditing?(textView)
     }
     
-    func textView(textView: UITextView, shouldChangeTextInRange range: NSRange, replacementText text: String) -> Bool {
+    public func textView(textView: UITextView, shouldChangeTextInRange range: NSRange, replacementText text: String) -> Bool {
         
         var shouldReturn = true
         
@@ -424,17 +437,17 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         return shouldReturn
     }
     
-    func textViewDidChange(textView: UITextView) {
+    public func textViewDidChange(textView: UITextView) {
         
         delegate?.textViewDidChange?(textView)
     }
     
-    func textViewDidChangeSelection(textView: UITextView) {
+    public func textViewDidChangeSelection(textView: UITextView) {
         
         delegate?.textViewDidChangeSelection?(textView)
     }
     
-    func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
+    public func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
         
         if delegate?.respondsToSelector("textView:shouldInteractWithURL:inRange:") != nil {
             return ((delegate?.textView?(textView, shouldInteractWithURL: URL, inRange: characterRange)) == true)
@@ -444,7 +457,7 @@ class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextViewDele
         
     }
     
-    func textView(textView: UITextView, shouldInteractWithTextAttachment textAttachment: NSTextAttachment, inRange characterRange: NSRange) -> Bool {
+    public func textView(textView: UITextView, shouldInteractWithTextAttachment textAttachment: NSTextAttachment, inRange characterRange: NSRange) -> Bool {
         
         if delegate?.respondsToSelector("textView:shouldInteractWithTextAttachment:inRange:") != nil {
             return ((delegate?.textView?(textView, shouldInteractWithTextAttachment: textAttachment, inRange: characterRange)) == true)
diff --git a/Clutch/IQKeybordManagerSwift/IQTextView/IQTextView.swift b/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
old mode 100644
new mode 100755
similarity index 71%
rename from Clutch/IQKeybordManagerSwift/IQTextView/IQTextView.swift
rename to IQKeyboardManagerSwift/IQTextView/IQTextView.swift
index 66cc923..3e837fc
--- a/Clutch/IQKeybordManagerSwift/IQTextView/IQTextView.swift
+++ b/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
@@ -1,7 +1,7 @@
 //
 //  IQTextView.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,16 +25,31 @@
 import UIKit
 
 /** @abstract UITextView with placeholder support   */
-class IQTextView : UITextView {
+public class IQTextView : UITextView {
 
-    required init(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
     }
 
+    override init(frame: CGRect, textContainer: NSTextContainer?) {
+        super.init(frame: frame, textContainer: textContainer)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
+    }
+    
+    override public func awakeFromNib() {
+         super.awakeFromNib()
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
+    }
+    
+    deinit {
+        NSNotificationCenter.defaultCenter().removeObserver(self)
+    }
+    
     private var placeholderLabel: UILabel?
     
     /** @abstract To set textView's placeholder text. Default is ni.    */
-    var placeholder : String? {
+    public var placeholder : String? {
 
         get {
             return placeholderLabel?.text
@@ -48,7 +63,7 @@ class IQTextView : UITextView {
                 
                 if let unwrappedPlaceholderLabel = placeholderLabel {
                     
-                    unwrappedPlaceholderLabel.autoresizingMask = .FlexibleWidth | .FlexibleHeight
+                    unwrappedPlaceholderLabel.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
                     unwrappedPlaceholderLabel.lineBreakMode = .ByWordWrapping
                     unwrappedPlaceholderLabel.numberOfLines = 0
                     unwrappedPlaceholderLabel.font = self.font
@@ -64,16 +79,16 @@ class IQTextView : UITextView {
         }
     }
     
-    private func refreshPlaceholder() {
+    public func refreshPlaceholder() {
         
-        if count(text) != 0 {
+        if text.characters.count != 0 {
             placeholderLabel?.alpha = 0
         } else {
             placeholderLabel?.alpha = 1
         }
     }
     
-    override var text: String! {
+    override public var text: String! {
         
         didSet {
             
@@ -82,7 +97,7 @@ class IQTextView : UITextView {
         }
     }
     
-    override var font : UIFont? {
+    override public var font : UIFont? {
        
         didSet {
             
@@ -94,7 +109,7 @@ class IQTextView : UITextView {
         }
     }
     
-    override var delegate : UITextViewDelegate? {
+    override public var delegate : UITextViewDelegate? {
         
         get {
             refreshPlaceholder()
diff --git a/IQKeyboardManagerSwift/IQToolbar/IQBarButtonItem.swift b/IQKeyboardManagerSwift/IQToolbar/IQBarButtonItem.swift
new file mode 100755
index 0000000..87f23b8
--- /dev/null
+++ b/IQKeyboardManagerSwift/IQToolbar/IQBarButtonItem.swift
@@ -0,0 +1,79 @@
+//
+//  IQBarButtonItem.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+import UIKit
+
+public class IQBarButtonItem: UIBarButtonItem {
+   
+    override public class func initialize() {
+
+        superclass()?.initialize()
+        
+        //Tint color
+        self.appearance().tintColor = nil
+
+        //Title
+        self.appearance().setTitlePositionAdjustment(UIOffsetZero, forBarMetrics: UIBarMetrics.Default)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Normal)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Highlighted)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Disabled)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Selected)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Application)
+        self.appearance().setTitleTextAttributes(nil, forState: UIControlState.Reserved)
+
+        //Background Image
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Normal,      barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Highlighted, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Disabled,    barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Selected,    barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Application, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Reserved,    barMetrics: UIBarMetrics.Default)
+        
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Normal,      style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Highlighted, style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Disabled,    style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Selected,    style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Application, style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Reserved,    style: UIBarButtonItemStyle.Done, barMetrics: UIBarMetrics.Default)
+        
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Normal,      style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Highlighted, style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Disabled,    style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Selected,    style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Application, style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forState: UIControlState.Reserved,    style: UIBarButtonItemStyle.Plain, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundVerticalPositionAdjustment(0, forBarMetrics: UIBarMetrics.Default)
+
+        //Back Button
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Normal,      barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Highlighted, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Disabled,    barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Selected,    barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Application, barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundImage(nil, forState: UIControlState.Reserved,    barMetrics: UIBarMetrics.Default)
+
+        self.appearance().setBackButtonTitlePositionAdjustment(UIOffsetZero, forBarMetrics: UIBarMetrics.Default)
+        self.appearance().setBackButtonBackgroundVerticalPositionAdjustment(0, forBarMetrics: UIBarMetrics.Default)
+    }
+}
diff --git a/Clutch/IQKeybordManagerSwift/IQToolbar/IQTitleBarButtonItem.swift b/IQKeyboardManagerSwift/IQToolbar/IQTitleBarButtonItem.swift
old mode 100644
new mode 100755
similarity index 55%
rename from Clutch/IQKeybordManagerSwift/IQToolbar/IQTitleBarButtonItem.swift
rename to IQKeyboardManagerSwift/IQToolbar/IQTitleBarButtonItem.swift
index 93ed897..0307223
--- a/Clutch/IQKeybordManagerSwift/IQToolbar/IQTitleBarButtonItem.swift
+++ b/IQKeyboardManagerSwift/IQToolbar/IQTitleBarButtonItem.swift
@@ -1,7 +1,7 @@
 //
 //  IQTitleBarButtonItem.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,41 +24,49 @@
 
 import UIKit
 
-class IQTitleBarButtonItem: UIBarButtonItem {
+public class IQTitleBarButtonItem: IQBarButtonItem {
    
-    var font : UIFont? {
+    public var font : UIFont? {
     
         didSet {
             if let unwrappedFont = font {
-                titleLabel?.font = unwrappedFont
+                _titleLabel?.font = unwrappedFont
             } else {
-                titleLabel?.font = UIFont.boldSystemFontOfSize(12)
+                _titleLabel?.font = UIFont.systemFontOfSize(13)
             }
         }
     }
     
-    private var titleLabel : UILabel?
-    
+    private var _titleLabel : UILabel?
+    private var _titleView : UIView?
+
     override init() {
         super.init()
     }
     
-    init(frame : CGRect, title : String?) {
+    init(title : String?) {
 
-        super.init(title: nil, style: UIBarButtonItemStyle.Plain, target: nil, action: nil)
+        self.init(title: nil, style: UIBarButtonItemStyle.Plain, target: nil, action: nil)
+        
+        _titleView = UIView()
+        _titleView?.backgroundColor = UIColor.clearColor()
+        _titleView?.autoresizingMask = [.FlexibleWidth,.FlexibleHeight]
         
-        titleLabel = UILabel(frame: frame)
-        titleLabel?.backgroundColor = UIColor.clearColor()
-        titleLabel?.textAlignment = .Center
-        titleLabel?.text = title
-        titleLabel?.autoresizingMask = .FlexibleWidth
-        font = UIFont.boldSystemFontOfSize(12.0)
-        titleLabel?.font = self.font
-        customView = titleLabel
+        _titleLabel = UILabel()
+        _titleLabel?.numberOfLines = 0
+        _titleLabel?.textColor = UIColor.grayColor()
+        _titleLabel?.backgroundColor = UIColor.clearColor()
+        _titleLabel?.textAlignment = .Center
+        _titleLabel?.text = title
+        _titleLabel?.autoresizingMask = [.FlexibleWidth,.FlexibleHeight]
+        font = UIFont.systemFontOfSize(13.0)
+        _titleLabel?.font = self.font
+        _titleView?.addSubview(_titleLabel!)
+        customView = _titleView
         enabled = false
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
 }
diff --git a/IQKeyboardManagerSwift/IQToolbar/IQToolbar.swift b/IQKeyboardManagerSwift/IQToolbar/IQToolbar.swift
new file mode 100755
index 0000000..f607f95
--- /dev/null
+++ b/IQKeyboardManagerSwift/IQToolbar/IQToolbar.swift
@@ -0,0 +1,191 @@
+//
+//  IQToolbar.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+import UIKit
+
+/** @abstract   IQToolbar for IQKeyboardManager.    */
+public class IQToolbar: UIToolbar , UIInputViewAudioFeedback {
+
+    override public class func initialize() {
+        
+        superclass()?.initialize()
+                
+        self.appearance().barTintColor = nil
+        
+        //Background image
+        self.appearance().setBackgroundImage(nil, forToolbarPosition: UIBarPosition.Any,            barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forToolbarPosition: UIBarPosition.Bottom,         barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forToolbarPosition: UIBarPosition.Top,            barMetrics: UIBarMetrics.Default)
+        self.appearance().setBackgroundImage(nil, forToolbarPosition: UIBarPosition.TopAttached,    barMetrics: UIBarMetrics.Default)
+
+        self.appearance().setShadowImage(nil, forToolbarPosition: UIBarPosition.Any)
+        self.appearance().setShadowImage(nil, forToolbarPosition: UIBarPosition.Bottom)
+        self.appearance().setShadowImage(nil, forToolbarPosition: UIBarPosition.Top)
+        self.appearance().setShadowImage(nil, forToolbarPosition: UIBarPosition.TopAttached)
+        
+        //Background color
+        self.appearance().backgroundColor = nil
+    }
+    
+    public var titleFont : UIFont? {
+        
+        didSet {
+            
+            if let newItems = items {
+                for item in newItems {
+                    
+                    if let newItem = item as? IQTitleBarButtonItem {
+                        newItem.font = titleFont
+                    }
+                }
+            }
+        }
+    }
+    
+    public var title : String? {
+        
+        didSet {
+            
+            if let newItems = items {
+                for item in newItems {
+                    
+                    if let newItem = item as? IQTitleBarButtonItem {
+                        newItem.font = titleFont
+                    }
+                }
+            }
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        sizeToFit()
+        autoresizingMask = UIViewAutoresizing.FlexibleWidth
+        tintColor = UIColor .blackColor()
+        self.translucent = true
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+
+        sizeToFit()
+        autoresizingMask = UIViewAutoresizing.FlexibleWidth
+        tintColor = UIColor .blackColor()
+        self.translucent = true
+    }
+
+    override public func sizeThatFits(size: CGSize) -> CGSize {
+        var sizeThatFit = super.sizeThatFits(size)
+        sizeThatFit.height = 44
+        return sizeThatFit
+    }
+
+    override public var tintColor: UIColor! {
+        
+        didSet {
+            if let unwrappedItems = items {
+                for item in unwrappedItems {
+                    
+                    if let newItem = item as? IQTitleBarButtonItem {
+                        newItem.tintColor = tintColor
+                    }
+                }
+            }
+        }
+    }
+    
+    override public func layoutSubviews() {
+
+        super.layoutSubviews()
+        
+        struct InternalClass {
+            
+            static var IQUIToolbarTextButtonClass: AnyClass?   =   NSClassFromString("UIToolbarTextButton")
+            static var IQUIToolbarButtonClass: AnyClass?      =   NSClassFromString("UIToolbarButton")
+        }
+
+
+        var leftRect = CGRectNull
+        var rightRect = CGRectNull
+        var isTitleBarButtonFound = false
+        
+        let sortedSubviews = self.subviews.sort({ (view1 : UIView, view2 : UIView) -> Bool in
+            
+            let x1 = CGRectGetMinX(view1.frame)
+            let y1 = CGRectGetMinY(view1.frame)
+            let x2 = CGRectGetMinX(view2.frame)
+            let y2 = CGRectGetMinY(view2.frame)
+            
+            if x1 != x2 {
+                return x1 < x2
+            } else {
+                return y1 < y2
+            }
+        })
+        
+        for barButtonItemView in sortedSubviews {
+
+            if (isTitleBarButtonFound == true)
+            {
+                rightRect = barButtonItemView.frame
+                break;
+            }
+            else if (barButtonItemView.dynamicType === UIView.self)
+            {
+                isTitleBarButtonFound = true
+            }
+            else if ((InternalClass.IQUIToolbarTextButtonClass != nil && barButtonItemView.isKindOfClass(InternalClass.IQUIToolbarTextButtonClass!) == true) || (InternalClass.IQUIToolbarButtonClass != nil && barButtonItemView.isKindOfClass(InternalClass.IQUIToolbarButtonClass!) == true))
+            {
+                leftRect = barButtonItemView.frame
+            }
+        }
+        
+        var x : CGFloat = 16
+        
+        if (CGRectIsNull(leftRect) == false)
+        {
+            x = CGRectGetMaxX(leftRect) + 16
+        }
+        
+        let width : CGFloat = CGRectGetWidth(self.frame) - 32 - (CGRectIsNull(leftRect) ? 0 : CGRectGetMaxX(leftRect)) - (CGRectIsNull(rightRect) ? 0 : CGRectGetWidth(self.frame) - CGRectGetMinX(rightRect))
+        
+        
+        if let unwrappedItems = items {
+            for item in unwrappedItems {
+                
+                if let newItem = item as? IQTitleBarButtonItem {
+
+                    let titleRect = CGRectMake(x, 0, width, self.frame.size.height)
+                    newItem.customView?.frame = titleRect
+                    break
+                }
+            }
+        }
+    }
+    
+    public var enableInputClicksWhenVisible: Bool {
+        return true
+    }
+}
diff --git a/Clutch/IQKeybordManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift b/IQKeyboardManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift
old mode 100644
new mode 100755
similarity index 51%
rename from Clutch/IQKeybordManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift
rename to IQKeyboardManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift
index ce93813..f64b7d2
--- a/Clutch/IQKeybordManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift
+++ b/IQKeyboardManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift
@@ -1,7 +1,7 @@
 //
 //  IQUIView+IQKeyboardToolbar.swift
 // https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-15 Iftekhar Qurashi.
+// Copyright (c) 2013-16 Iftekhar Qurashi.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,19 @@
 import Foundation
 import UIKit
 
+private var kIQShouldHideTitle      = "kIQShouldHideTitle"
+
+private var kIQPreviousInvocationTarget     = "kIQPreviousInvocationTarget"
+private var kIQPreviousInvocationSelector   = "kIQPreviousInvocationSelector"
+private var kIQNextInvocationTarget         = "kIQNextInvocationTarget"
+private var kIQNextInvocationSelector       = "kIQNextInvocationSelector"
+private var kIQDoneInvocationTarget         = "kIQDoneInvocationTarget"
+private var kIQDoneInvocationSelector       = "kIQDoneInvocationSelector"
+
 /**
 UIView category methods to add IQToolbar on UIKeyboard.
 */
-extension UIView {
+public extension UIView {
     
     ///-------------------------
     /// MARK: Title and Distance
@@ -37,9 +46,9 @@ extension UIView {
     /**
     If shouldHideTitle is YES, then title will not be added to the toolbar. Default to NO.
     */
-    var shouldHideTitle: Bool? {
+    public var shouldHideTitle: Bool? {
         get {
-            let aValue: AnyObject? = objc_getAssociatedObject(self, "shouldHideTitle")
+            let aValue: AnyObject? = objc_getAssociatedObject(self, &kIQShouldHideTitle)
             
             if aValue == nil {
                 return false
@@ -48,7 +57,15 @@ extension UIView {
             }
         }
         set(newValue) {
-            objc_setAssociatedObject(self, "shouldHideTitle", newValue, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+            objc_setAssociatedObject(self, &kIQShouldHideTitle, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            
+            if let toolbar = self.inputAccessoryView as? IQToolbar {
+                if let textField = self as? UITextField {
+                    toolbar.title = textField.placeholder
+                } else if let textView = self as? IQTextView {
+                    toolbar.title = textView.placeholder
+                }
+            }
         }
     }
     
@@ -56,47 +73,124 @@ extension UIView {
     /// TODO: Customised Invocation Registration
     ///-----------------------------------------
     
-//    /**
-//    Additional target & action to do get callback action. Note that setting custom `previous` selector doesn't affect native `previous` functionality, this is just used to notifiy user to do additional work according to need.
-//    
-//    @param target Target object.
-//    @param action Target Selector.
-//    */
-//    -(void)setCustomPreviousTarget:(id)target action:(SEL)action;
-//    
-//    /**
-//    Additional target & action to do get callback action. Note that setting custom `next` selector doesn't affect native `next` functionality, this is just used to notifiy user to do additional work according to need.
-//    
-//    @param target Target object.
-//    @param action Target Selector.
-//    */
-//    -(void)setCustomNextTarget:(id)target action:(SEL)action;
-//    
-//    /**
-//    Additional target & action to do get callback action. Note that setting custom `done` selector doesn't affect native `done` functionality, this is just used to notifiy user to do additional work according to need.
-//    
-//    @param target Target object.
-//    @param action Target Selector.
-//    */
-//    -(void)setCustomDoneTarget:(id)target action:(SEL)action;
-//    
-//    /**
-//    Customized Invocation to be called on previous arrow action. previousInvocation is internally created using setCustomPreviousTarget: method.
-//    */
-//    @property (strong, nonatomic) NSInvocation *previousInvocation;
-//    
-//    /**
-//    Customized Invocation to be called on next arrow action. nextInvocation is internally created using setCustomNextTarget: method.
-//    */
-//    @property (strong, nonatomic) NSInvocation *nextInvocation;
-//    
-//    /**
-//    Customized Invocation to be called on done action. doneInvocation is internally created using setCustomDoneTarget: method.
-//    */
-//    @property (strong, nonatomic) NSInvocation *doneInvocation;
+    /**
+    Additional target & action to do get callback action. Note that setting custom `previous` selector doesn't affect native `previous` functionality, this is just used to notifiy user to do additional work according to need.
     
+    @param target Target object.
+    @param action Target Selector.
+    */
+    public func setCustomPreviousTarget(target: AnyObject?, selector: Selector?) {
+        previousInvocation = (target, selector)
+    }
+    
+    /**
+    Additional target & action to do get callback action. Note that setting custom `next` selector doesn't affect native `next` functionality, this is just used to notifiy user to do additional work according to need.
+    
+    @param target Target object.
+    @param action Target Selector.
+    */
+    public func setCustomNextTarget(target: AnyObject?, selector: Selector?) {
+        nextInvocation = (target, selector)
+    }
+    
+    /**
+    Additional target & action to do get callback action. Note that setting custom `done` selector doesn't affect native `done` functionality, this is just used to notifiy user to do additional work according to need.
+    
+    @param target Target object.
+    @param action Target Selector.
+    */
+    public func setCustomDoneTarget(target: AnyObject?, selector: Selector?) {
+        doneInvocation = (target, selector)
+    }
+    
+    /**
+    Customized Invocation to be called on previous arrow action. previousInvocation is internally created using setCustomPreviousTarget: method.
+    */
+    public var previousInvocation : (target: AnyObject?, selector: Selector?) {
+        get {
+            let target: AnyObject? = objc_getAssociatedObject(self, &kIQPreviousInvocationTarget)
+            var selector : Selector?
+
+            if let selectorString = objc_getAssociatedObject(self, &kIQPreviousInvocationSelector) as? String {
+                selector = NSSelectorFromString(selectorString)
+            }
+            
+            return (target: target, selector: selector)
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQPreviousInvocationTarget, newValue.target, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            
+            if let unwrappedSelector = newValue.selector {
+                objc_setAssociatedObject(self, &kIQPreviousInvocationSelector, NSStringFromSelector(unwrappedSelector), objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            } else {
+                objc_setAssociatedObject(self, &kIQPreviousInvocationSelector, nil, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            }
+        }
+    }
 
+    /**
+    Customized Invocation to be called on next arrow action. nextInvocation is internally created using setCustomNextTarget: method.
+    */
+    public var nextInvocation : (target: AnyObject?, selector: Selector?) {
+        get {
+            let target: AnyObject? = objc_getAssociatedObject(self, &kIQNextInvocationTarget)
+            var selector : Selector?
+            
+            if let selectorString = objc_getAssociatedObject(self, &kIQNextInvocationSelector) as? String {
+                selector = NSSelectorFromString(selectorString)
+            }
+            
+            return (target: target, selector: selector)
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQNextInvocationTarget, newValue.target, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            
+            if let unwrappedSelector = newValue.selector {
+                objc_setAssociatedObject(self, &kIQNextInvocationSelector, NSStringFromSelector(unwrappedSelector), objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            } else {
+                objc_setAssociatedObject(self, &kIQNextInvocationSelector, nil, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            }
+        }
+    }
     
+    /**
+    Customized Invocation to be called on done action. doneInvocation is internally created using setCustomDoneTarget: method.
+    */
+    public var doneInvocation : (target: AnyObject?, selector: Selector?) {
+        get {
+            let target: AnyObject? = objc_getAssociatedObject(self, &kIQDoneInvocationTarget)
+            var selector : Selector?
+            
+            if let selectorString = objc_getAssociatedObject(self, &kIQDoneInvocationSelector) as? String {
+                selector = NSSelectorFromString(selectorString)
+            }
+            
+            return (target: target, selector: selector)
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &kIQDoneInvocationTarget, newValue.target, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            
+            if let unwrappedSelector = newValue.selector {
+                objc_setAssociatedObject(self, &kIQDoneInvocationSelector, NSStringFromSelector(unwrappedSelector), objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            } else {
+                objc_setAssociatedObject(self, &kIQDoneInvocationSelector, nil, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            }
+        }
+    }
+    
+    ///---------------------
+    /// MARK: Private helper
+    ///---------------------
+    
+    public static func flexibleBarButtonItem () -> IQBarButtonItem {
+        
+        struct Static {
+            static let nilButton = IQBarButtonItem(barButtonSystemItem:UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
+        }
+        
+        return Static.nilButton
+    }
+
     ///------------
     /// MARK: Done
     ///------------
@@ -107,7 +201,7 @@ extension UIView {
     @param target Target object for selector.
     @param action Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addDoneOnKeyboardWithTarget(target : AnyObject?, action : Selector) {
+    public func addDoneOnKeyboardWithTarget(target : AnyObject?, action : Selector) {
         
         addDoneOnKeyboardWithTarget(target, action: action, titleText: nil)
     }
@@ -119,7 +213,7 @@ extension UIView {
     @param action Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addDoneOnKeyboardWithTarget (target : AnyObject?, action : Selector, titleText: String?) {
+    public func addDoneOnKeyboardWithTarget (target : AnyObject?, action : Selector, titleText: String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -128,25 +222,14 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    /*
-                    50 done button frame.
-                    24 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-64.0-12.0, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
-            
-            
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
-            items.append(nilButton)
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+
+            //Done button
             let doneButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: target, action: action)
             items.append(doneButton)
             
@@ -183,7 +266,7 @@ extension UIView {
     @param action Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
     */
-    func addDoneOnKeyboardWithTarget (target : AnyObject?, action : Selector, shouldShowPlaceholder: Bool) {
+    public func addDoneOnKeyboardWithTarget (target : AnyObject?, action : Selector, shouldShowPlaceholder: Bool) {
         
         var title : String?
         
@@ -202,6 +285,84 @@ extension UIView {
     ///------------
     /// MARK: Right
     ///------------
+
+    /**
+     Helper function to add Right button on keyboard.
+     
+     @param image Image icon to use as right button.
+     @param target Target object for selector.
+     @param action Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
+     @param titleText text to show as title in IQToolbar'.
+     */
+    public func addRightButtonOnKeyboardWithImage (image : UIImage, target : AnyObject?, action : Selector, titleText: String?) {
+        
+        //If can't set InputAccessoryView. Then return
+        if self is UITextField || self is UITextView {
+            
+            //  Creating a toolBar for phoneNumber keyboard
+            let toolbar = IQToolbar()
+            
+            var items : [UIBarButtonItem] = []
+            
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
+            
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Right button
+            let doneButton = IQBarButtonItem(image: image, style: UIBarButtonItemStyle.Done, target: target, action: action)
+            items.append(doneButton)
+            
+            //  Adding button to toolBar.
+            toolbar.items = items
+            
+            //  Setting toolbar to keyboard.
+            if let textField = self as? UITextField {
+                textField.inputAccessoryView = toolbar
+                
+                switch textField.keyboardAppearance {
+                case UIKeyboardAppearance.Dark:
+                    toolbar.barStyle = UIBarStyle.Black
+                default:
+                    toolbar.barStyle = UIBarStyle.Default
+                }
+            } else if let textView = self as? UITextView {
+                textView.inputAccessoryView = toolbar
+                
+                switch textView.keyboardAppearance {
+                case UIKeyboardAppearance.Dark:
+                    toolbar.barStyle = UIBarStyle.Black
+                default:
+                    toolbar.barStyle = UIBarStyle.Default
+                }
+            }
+        }
+    }
+    
+    /**
+     Helper function to add Right button on keyboard.
+     
+     @param image Image icon to use as right button.
+     @param target Target object for selector.
+     @param action Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
+     @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
+     */
+    public func addRightButtonOnKeyboardWithImage (image : UIImage, target : AnyObject?, action : Selector, shouldShowPlaceholder: Bool) {
+        
+        var title : String?
+        
+        if shouldShowPlaceholder == true {
+            if let textField = self as? UITextField {
+                title = textField.placeholder
+            } else if let textView = self as? IQTextView {
+                title = textView.placeholder
+            }
+        }
+        
+        addRightButtonOnKeyboardWithImage(image, target: target, action: action, titleText: title)
+    }
     
     /**
     Helper function to add Right button on keyboard.
@@ -210,7 +371,7 @@ extension UIView {
     @param target Target object for selector.
     @param action Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector) {
+    public func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector) {
         
         addRightButtonOnKeyboardWithText(text, target: target, action: action, titleText: nil)
     }
@@ -223,7 +384,7 @@ extension UIView {
     @param action Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector, titleText: String?) {
+    public func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector, titleText: String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -233,25 +394,14 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    
-                    /*
-                    50 done button frame.
-                    24 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-50.0-24, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
-            items.append(nilButton)
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
+            //Right button
             let doneButton = IQBarButtonItem(title: text, style: UIBarButtonItemStyle.Done, target: target, action: action)
             items.append(doneButton)
             
@@ -289,7 +439,7 @@ extension UIView {
     @param action Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
     */
-    func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector, shouldShowPlaceholder: Bool) {
+    public func addRightButtonOnKeyboardWithText (text : String, target : AnyObject?, action : Selector, shouldShowPlaceholder: Bool) {
         
         var title : String?
 
@@ -316,7 +466,7 @@ extension UIView {
     @param cancelAction Cancel button action name. Usually 'cancelAction:(IQBarButtonItem*)item'.
     @param doneAction Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector) {
+    public func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector) {
         
         addCancelDoneOnKeyboardWithTarget(target, cancelAction: cancelAction, doneAction: doneAction, titleText: nil)
     }
@@ -329,7 +479,7 @@ extension UIView {
     @param doneAction Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector, titleText: String?) {
+    public func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector, titleText: String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -338,29 +488,21 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            //  Create a cancel button to show on keyboard to resign it. Adding a selector to resign it.
+            //Cancel button
             let cancelButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Cancel, target: target, action: cancelAction)
             items.append(cancelButton)
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    /*
-                    66 Cancel button maximum x.
-                    50 done button frame.
-                    8+8 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-66-50.0-16, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
             
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
-            items.append(nilButton)
+            //Title
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Done button
             let doneButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: target, action: doneAction)
             items.append(doneButton)
             
@@ -398,7 +540,7 @@ extension UIView {
     @param doneAction Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
     */
-    func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector, shouldShowPlaceholder: Bool) {
+    public func addCancelDoneOnKeyboardWithTarget (target : AnyObject?, cancelAction : Selector, doneAction : Selector, shouldShowPlaceholder: Bool) {
         
         var title : String?
         
@@ -427,7 +569,7 @@ extension UIView {
     @param leftButtonAction Left button action name. Usually 'cancelAction:(IQBarButtonItem*)item'.
     @param rightButtonAction Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector) {
+    public func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector) {
         
         addRightLeftOnKeyboardWithTarget(target, leftButtonTitle: leftButtonTitle, rightButtonTitle: rightButtonTitle, rightButtonAction: rightButtonAction, leftButtonAction: leftButtonAction, titleText: nil)
     }
@@ -442,7 +584,7 @@ extension UIView {
     @param rightButtonAction Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector, titleText: String?) {
+    public func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector, titleText: String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -451,30 +593,22 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            //  Create a cancel button to show on keyboard to resign it. Adding a selector to resign it.
-            let cancelButton = IQBarButtonItem(title: leftButtonTitle, style: UIBarButtonItemStyle.Bordered, target: target, action: leftButtonAction)
+            //Left button
+            let cancelButton = IQBarButtonItem(title: leftButtonTitle, style: UIBarButtonItemStyle.Plain, target: target, action: leftButtonAction)
             items.append(cancelButton)
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    /*
-                    66 Cancel button maximum x.
-                    50 done button frame.
-                    8+8 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-66-50.0-16, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
-            items.append(nilButton)
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
-            let doneButton = IQBarButtonItem(title: rightButtonTitle, style: UIBarButtonItemStyle.Bordered, target: target, action: rightButtonAction)
+            //Right button
+            let doneButton = IQBarButtonItem(title: rightButtonTitle, style: UIBarButtonItemStyle.Done, target: target, action: rightButtonAction)
             items.append(doneButton)
             
             //  Adding button to toolBar.
@@ -513,7 +647,7 @@ extension UIView {
     @param rightButtonAction Right button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
     */
-    func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector, shouldShowPlaceholder: Bool) {
+    public func addRightLeftOnKeyboardWithTarget( target : AnyObject?, leftButtonTitle : String, rightButtonTitle : String, rightButtonAction : Selector, leftButtonAction : Selector, shouldShowPlaceholder: Bool) {
         
         var title : String?
         
@@ -541,7 +675,7 @@ extension UIView {
     @param nextAction Next button action name. Usually 'nextAction:(id)item'.
     @param doneAction Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addPreviousNextDoneOnKeyboardWithTarget ( target : AnyObject?, previousAction : Selector, nextAction : Selector, doneAction : Selector) {
+    public func addPreviousNextDoneOnKeyboardWithTarget ( target : AnyObject?, previousAction : Selector, nextAction : Selector, doneAction : Selector) {
         
         addPreviousNextDoneOnKeyboardWithTarget(target, previousAction: previousAction, nextAction: nextAction, doneAction: doneAction, titleText: nil)
     }
@@ -555,7 +689,7 @@ extension UIView {
     @param doneAction Done button action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addPreviousNextDoneOnKeyboardWithTarget ( target : AnyObject?, previousAction : Selector, nextAction : Selector, doneAction : Selector,  titleText: String?) {
+    public func addPreviousNextDoneOnKeyboardWithTarget ( target : AnyObject?, previousAction : Selector, nextAction : Selector, doneAction : Selector,  titleText: String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -564,44 +698,54 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
-            let doneButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: target, action: doneAction)
-
-            let bundle = NSBundle(forClass: IQBarButtonItem.self)
-
-            // CocoaPods won't preserve filepath of files in IQKeyboardManager.bundle so
-            // fallback to seek prev and next image from top level bundle
-            let prevImage = UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil)
-            let prev = IQBarButtonItem(image: prevImage, style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            let prev : IQBarButtonItem
+            let next : IQBarButtonItem
             
-            let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
-            fixed.width = 23
+            // Get the top level "bundle" which may actually be the framework
+            var bundle = NSBundle(forClass: IQKeyboardManager.self)
+            
+            if let resourcePath = bundle.pathForResource("IQKeyboardManager", ofType: "bundle") {
+                if let resourcesBundle = NSBundle(path: resourcePath) {
+                    bundle = resourcesBundle
+                }
+            }
+            
+            var imageLeftArrow = UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil)
+            var imageRightArrow = UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil)
+            
+            //Support for RTL languages like Arabic, Persia etc... (Bug ID: #448)
+            if #available(iOS 9.0, *) {
+                imageLeftArrow = imageLeftArrow?.imageFlippedForRightToLeftLayoutDirection()
+                imageRightArrow = imageRightArrow?.imageFlippedForRightToLeftLayoutDirection()
+            }
 
-            let nextImage = UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil)
-            let next = IQBarButtonItem(image: nextImage, style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            prev = IQBarButtonItem(image: imageLeftArrow, style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
             
+            next = IQBarButtonItem(image: imageRightArrow, style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+
+            //Previous button
             items.append(prev)
+
+            //Fixed space
+            let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
+            fixed.width = 23
             items.append(fixed)
+
+            //Next button
             items.append(next)
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    /*
-                    72.5 next/previous maximum x.
-                    50 done button frame.
-                    8+8 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-72.5-50.0-16, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
             
-            items.append(nilButton)
+            //Done button
+            let doneButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: target, action: doneAction)
             items.append(doneButton)
             
             //  Adding button to toolBar.
@@ -659,7 +803,128 @@ extension UIView {
     ///--------------------------
     
     /**
-    Helper function to add SegmentedNextPrevious/ArrowNextPrevious and Right button on keyboard.
+    Helper function to add ArrowNextPrevious and Right button on keyboard.
+    
+    @param target Target object for selector.
+    @param rightButtonTitle Title for rightBarButtonItem, usually 'Done'.
+    @param previousAction Previous button action name. Usually 'previousAction:(id)item'.
+    @param nextAction Next button action name. Usually 'nextAction:(id)item'.
+    @param rightButtonAction RightBarButton action name. Usually 'doneAction:(IQBarButtonItem*)item'.
+    @param titleText text to show as title in IQToolbar'.
+    */
+    public func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonImage : UIImage, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, titleText : String?) {
+        
+        //If can't set InputAccessoryView. Then return
+        if self is UITextField || self is UITextView {
+            //  Creating a toolBar for phoneNumber keyboard
+            let toolbar = IQToolbar()
+            
+            var items : [UIBarButtonItem] = []
+            
+            let prev : IQBarButtonItem
+            let next : IQBarButtonItem
+            
+            // Get the top level "bundle" which may actually be the framework
+            var bundle = NSBundle(forClass: IQKeyboardManager.self)
+            
+            if let resourcePath = bundle.pathForResource("IQKeyboardManager", ofType: "bundle") {
+                if let resourcesBundle = NSBundle(path: resourcePath) {
+                    bundle = resourcesBundle
+                }
+            }
+            
+            var imageLeftArrow = UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil)
+            var imageRightArrow = UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil)
+            
+            //Support for RTL languages like Arabic, Persia etc... (Bug ID: #448)
+            if #available(iOS 9.0, *) {
+                imageLeftArrow = imageLeftArrow?.imageFlippedForRightToLeftLayoutDirection()
+                imageRightArrow = imageRightArrow?.imageFlippedForRightToLeftLayoutDirection()
+            }
+            
+            prev = IQBarButtonItem(image: imageLeftArrow, style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            
+            next = IQBarButtonItem(image: imageRightArrow, style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            
+            //Previous button
+            items.append(prev)
+            
+            //Fixed space
+            let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
+            fixed.width = 23
+            items.append(fixed)
+            
+            //Next button
+            items.append(next)
+            
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
+            
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Right button
+            let doneButton = IQBarButtonItem(image: rightButtonImage, style: UIBarButtonItemStyle.Done, target: target, action: rightButtonAction)
+            items.append(doneButton)
+            
+            //  Adding button to toolBar.
+            toolbar.items = items
+            
+            //  Setting toolbar to keyboard.
+            if let textField = self as? UITextField {
+                textField.inputAccessoryView = toolbar
+                
+                switch textField.keyboardAppearance {
+                case UIKeyboardAppearance.Dark:
+                    toolbar.barStyle = UIBarStyle.Black
+                default:
+                    toolbar.barStyle = UIBarStyle.Default
+                }
+            } else if let textView = self as? UITextView {
+                textView.inputAccessoryView = toolbar
+                
+                switch textView.keyboardAppearance {
+                case UIKeyboardAppearance.Dark:
+                    toolbar.barStyle = UIBarStyle.Black
+                default:
+                    toolbar.barStyle = UIBarStyle.Default
+                }
+            }
+        }
+    }
+    
+    //    /**
+    //    Helper function to add ArrowNextPrevious and Right button on keyboard.
+    //
+    //    @param target Target object for selector.
+    //    @param rightButtonTitle Title for rightBarButtonItem, usually 'Done'.
+    //    @param previousAction Previous button action name. Usually 'previousAction:(id)item'.
+    //    @param nextAction Next button action name. Usually 'nextAction:(id)item'.
+    //    @param rightButtonAction RightBarButton action name. Usually 'doneAction:(IQBarButtonItem*)item'.
+    //    @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
+    //    */
+    public func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonImage : UIImage, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, shouldShowPlaceholder : Bool) {
+        
+        var title : String?
+        
+        if shouldShowPlaceholder == true {
+            if let textField = self as? UITextField {
+                title = textField.placeholder
+            } else if let textView = self as? IQTextView {
+                title = textView.placeholder
+            }
+        }
+        
+        addPreviousNextRightOnKeyboardWithTarget(target, rightButtonImage: rightButtonImage, previousAction: previousAction, nextAction: nextAction, rightButtonAction: rightButtonAction, titleText: title)
+    }
+    
+    
+    /**
+    Helper function to add ArrowNextPrevious and Right button on keyboard.
     
     @param target Target object for selector.
     @param rightButtonTitle Title for rightBarButtonItem, usually 'Done'.
@@ -667,13 +932,13 @@ extension UIView {
     @param nextAction Next button action name. Usually 'nextAction:(id)item'.
     @param rightButtonAction RightBarButton action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     */
-    func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector) {
+    public func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector) {
         
         addPreviousNextRightOnKeyboardWithTarget(target, rightButtonTitle: rightButtonTitle, previousAction: previousAction, nextAction: nextAction, rightButtonAction: rightButtonAction, titleText: nil)
     }
     
     /**
-    Helper function to add SegmentedNextPrevious/ArrowNextPrevious and Right button on keyboard.
+    Helper function to add ArrowNextPrevious and Right button on keyboard.
     
     @param target Target object for selector.
     @param rightButtonTitle Title for rightBarButtonItem, usually 'Done'.
@@ -682,7 +947,7 @@ extension UIView {
     @param rightButtonAction RightBarButton action name. Usually 'doneAction:(IQBarButtonItem*)item'.
     @param titleText text to show as title in IQToolbar'.
     */
-    func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, titleText : String?) {
+    public func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, titleText : String?) {
         
         //If can't set InputAccessoryView. Then return
         if self is UITextField || self is UITextView {
@@ -691,45 +956,54 @@ extension UIView {
             
             var items : [UIBarButtonItem] = []
             
-            //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
-            let doneButton = IQBarButtonItem(title: rightButtonTitle, style: UIBarButtonItemStyle.Bordered, target: target, action: rightButtonAction)
-
-
-            let bundle = NSBundle(forClass: IQBarButtonItem.self)
-
-            // CocoaPods won't preserve filepath of files in IQKeyboardManager.bundle so
-            // fallback to seek prev and next image from top level bundle
-            let prevImage = UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil)
-            let prev = IQBarButtonItem(image: prevImage, style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            let prev : IQBarButtonItem
+            let next : IQBarButtonItem
+            
+            // Get the top level "bundle" which may actually be the framework
+            var bundle = NSBundle(forClass: IQKeyboardManager.self)
+            
+            if let resourcePath = bundle.pathForResource("IQKeyboardManager", ofType: "bundle") {
+                if let resourcesBundle = NSBundle(path: resourcePath) {
+                    bundle = resourcesBundle
+                }
+            }
+            
+            var imageLeftArrow = UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil)
+            var imageRightArrow = UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil)
+            
+            //Support for RTL languages like Arabic, Persia etc... (Bug ID: #448)
+            if #available(iOS 9.0, *) {
+                imageLeftArrow = imageLeftArrow?.imageFlippedForRightToLeftLayoutDirection()
+                imageRightArrow = imageRightArrow?.imageFlippedForRightToLeftLayoutDirection()
+            }
+            
+            prev = IQBarButtonItem(image: imageLeftArrow, style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            
+            next = IQBarButtonItem(image: imageRightArrow, style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            
+            //Previous button
+            items.append(prev)
 
+            //Fixed space
             let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
             fixed.width = 23
-
-            let nextImage = UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil)
-            let next = IQBarButtonItem(image: nextImage, style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
-            
-            items.append(prev)
             items.append(fixed)
+
+            //Next button
             items.append(next)
             
-            if let unwrappedTitleText = titleText {
-                if count(unwrappedTitleText) != 0 && shouldHideTitle == false {
-                    /*
-                    72.5 next/previous maximum x.
-                    50 done button frame.
-                    8+8 distance maintenance
-                    */
-                    let buttonFrame = CGRectMake(0, 0, toolbar.frame.size.width-72.5-50.0-16, 44)
-                    
-                    let title = IQTitleBarButtonItem(frame: buttonFrame, title: unwrappedTitleText)
-                    items.append(title)
-                }
-            }
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
+            
+            //Title button
+            let title = IQTitleBarButtonItem(title: shouldHideTitle == true ? nil : titleText)
+            items.append(title)
             
-            //  Create a fake button to maintain flexibleSpace between doneButton and nilButton. (Actually it moves done button to right side.
-            let nilButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
+            //Flexible space
+            items.append(UIView.flexibleBarButtonItem())
             
-            items.append(nilButton)
+            //Right button
+            let doneButton = IQBarButtonItem(title: rightButtonTitle, style: UIBarButtonItemStyle.Done, target: target, action: rightButtonAction)
             items.append(doneButton)
             
             //  Adding button to toolBar.
@@ -759,7 +1033,7 @@ extension UIView {
     }
     
 //    /**
-//    Helper function to add SegmentedNextPrevious/ArrowNextPrevious and Right button on keyboard.
+//    Helper function to add ArrowNextPrevious and Right button on keyboard.
 //    
 //    @param target Target object for selector.
 //    @param rightButtonTitle Title for rightBarButtonItem, usually 'Done'.
@@ -768,7 +1042,7 @@ extension UIView {
 //    @param rightButtonAction RightBarButton action name. Usually 'doneAction:(IQBarButtonItem*)item'.
 //    @param shouldShowPlaceholder A boolean to indicate whether to show textField placeholder on IQToolbar'.
 //    */
-    func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, shouldShowPlaceholder : Bool) {
+    public func addPreviousNextRightOnKeyboardWithTarget( target : AnyObject?, rightButtonTitle : String, previousAction : Selector, nextAction : Selector, rightButtonAction : Selector, shouldShowPlaceholder : Bool) {
         
         var title : String?
         
@@ -794,7 +1068,7 @@ extension UIView {
     @param isPreviousEnabled BOOL to enable/disable previous button on keyboard.
     @param isNextEnabled  BOOL to enable/disable next button on keyboard..
     */
-    func setEnablePrevious ( isPreviousEnabled : Bool, isNextEnabled : Bool) {
+    public func setEnablePrevious ( isPreviousEnabled : Bool, isNextEnabled : Bool) {
         
         //  Getting inputAccessoryView.
         if let inputAccessoryView = self.inputAccessoryView as? IQToolbar {
diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft.png
new file mode 100755
index 0000000000000000000000000000000000000000..508c21774e1ac8b79da5c41d326a09286e23d768
GIT binary patch
literal 886
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eU!3HFY*6?ouQY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MQ<;1OBOz`!jG!i)^F
z=14FwFh*vEM3hAM`dB6B=jtV<<R_)-Rpb@`RWmTyR9FF-xv3?I3Kh9IdBs*0wn|_X
zRzNmLSYJs2tfVB{Rw=?aK*2e`C{@8!&qU8a$&O1wLBXadCCw_x#SN+*$g@?-C@Cqh
z($_C9FV`zK*2^zS*Eh7ZwA42+(l;{F1**_3uFNY*tkBIXR)!b?Gsh*hIJqdZpd>Rt
zPXT0ZVp4u-iLH_n$Rap^xU(cP4PjGWG1OZ?59)(t^bPe4^x<X$wc3D0t^A8JQ-L;v
z%(pYN0joq2gW6-G53(G|F%X}EMS)(m<Fe6*2b&$2&mr|lU?8`9x;Tbd2)0gI?|;}q
z<oNnE%^#FoCQQ&<yt{hu?o!36zuC16SXjFrTrg;KR1o0M;pB4WU~6<xm^MKms8h+J
zK;@5Y^QXA-*xOV4(&OImJ^%e)|LUV^(Y%-Mw`eHp%}Cwr=lj5T#^Kbv^WGh`UlV*(
zc+L!wf~$d6(`3$Fy0Jt4VAo;ZgE!8-w3sr_IO4$Coj+B47wPvTEa%+wvoAsS$i~h{
zR*Mv!X4X6Exdj%h8V(EgG~1S_@ZD%SY@aBslCJ#6W5c68>5s1DFMO^d$8xYq=t6$=
zq-});g3DC+D)ug`z4h60?qP$>jWx!qCrzF++MQc2lB8f6zdYi^rkyWhjP93)Z@d&P
zozip2m&r#pD*fWFyLoe!<~_FzIeBK2qhavMs3p?9q9S`Ib7<%CyPlK|?T)z~>vpky
z<rY^ZlV7Q;Tp2dBEHbZ;$TXk$NBvTiewL7@=xVVyPh6fEKfmN^(P!L0HO@nY@mrC{
z&&zA3n$AAEGvo>9#&|iE<*I=quFNq<-uRrYOVg?Q#i}to?8u`J@fM)e?dj_0vd$@?
F2>^TLKREyZ

literal 0
HcmV?d00001

diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..cfc40d6eb0908521aeb70f8ce13b874284be4bcb
GIT binary patch
literal 1793
zcmY*aX;_n28vTMqAQ)LimKs8owIpFjLkN;4@IeWbr8J<jC&0rNldv^xjRaX_5vWRt
zU_h2=O+i^js0NTyrbLF(0+wQ>6biP1u@xjd!+faY%-rX>_kHiV=brPv_s=c)#NQi<
zFh&3Xfb;<=K~OY=rj7c3XqAlCM?gU}-jn7D0G*YZJJE1xkB$X{XaMlJ1ppKj0>Cx|
z6|4Y2x*Y(lMgaif3IH5tiS7mxp#u#T7{&nrO})Jd1B4<-9Tt`tLg&(HeuUVx6kK#%
zS_}i1mBND906@$lKxqnt8;#CNNlxVuvfMFm7z8NagYg*j8wxkc9Yd#mg8nFt%|JWj
zoN#s+5(14z6WMW0LJ-C4-F0Z^j!EEhSp+;jGcyyH>4-~X$K&l!oH&8EbHF<|U?B#U
zlby<q&cdd0j=mN7j}C>wiDf6UxQS`0=sn%&n6z}RI|j37^nSdplbgu=uTv`LU0YCt
z_`MUnJ<bmQUK_ef+(QWg>_i6Syr)mHC%$3+ANJ0Nh~G2+pJLv2`UZtsB_W9T_s>Q`
z_{l88006G*L-7m&k+&{=oE-A0;g~!&*?PK;qo|#mvwpd1wMup>FPWkp(zU6zahWQ&
zcnHSG_=X0;s*b8cxIK=pUH)OSiAm)B@3s;!rLdN+gy63-=IR2216Kwe&r+8^*j=cr
zdss{QbxQ9FPm#UzuVrPULKHmi@-=wPFCakv#Q%rfVGXam&C;KcLq0kD%b)XjPs0my
zJkU#^&)SALv!ShsSte+k{w-88d!AgpZ|;h2LtyLd!uJUJRz=EFvbmXeORW<5OvI6N
zXS>zZ=es`|`4fBZ=FJcLx>`~~SfuuD+;BPR>NrD7XCM%!SveY$TCfo~(>Z`}ofE0-
zuo%y8>y+6Nzx1_^{+nfiBD`m`qc>{e=Apj(!P5cmqq6Dw`K$M?%Rw_!wbM1rS6+|%
zW&8ocnLqy-QAssGm3z5eIFN&oo1Vj}dZV{Tl5sq)xo9Y9Ud;eiIi}z*cL+TAww>!i
zKBkQm@s+psx7`iLbgWY_Q&=arVR(KY!nNqgzMZY`^>9^N;^S$(*g0H+2hla|<MEYd
z&g_elzn=Z0r-5qFP|?aukNWKcVt&=L1Ki?4m->2-ejU-A#_e$H;odZbBmZg*U(v<#
zQ=erYtC0_d8Fh)UH$B@^yPZ2&$xZsLJcEXX$~%H>_6$3V)aXVvwK9=OrhQ?W-aS8B
zUc|B%BiMo|kJy8-JmG$ERrlOb%KFQEm}Y=Qja#8hBP_2{aH=5Byhc8F?uS+3Y?VvY
zQzk#idYD(ErJg#el9vgWIy<U4_WwAr66`9vukUGuqW$p;IrdjfCy_H8A)H_=B<cIB
zWQ68!Y&B<@!im0LavhAB5u%ADQv0h1cbKP&1F=o`i-we*96y%ugu}z(f4cV?v2=C3
z?wr4_J)eb}LdhtH`-jp?jFn2|xU7ijzbN^Zx}bc56qsKYRYV-^W0hA85M*L}tMrUA
z9$0gVjP=!JF*?J#=<8!4;QWo#DD9u;kK1haiC@XT)<@7vs(|0Y#X~zUeI@3UldiQz
zpygsrFM<$B(;r;hhx8(={BkyIWK-^D_UQ;;t4TPibnB1eePpw<bX~FgxVX5x9TO95
zkddo6z8X2Xg}QMbq!_xa6p>>)lEe`gZvgZjx{iDkkFGX3zVfQ+3Cj$l&IY^H#w<!l
zJ=9h^l3D;smHL?QbZPrKO|*NAzw``24#-e_?7B$Zt^C56`r?8{M^nfe%>k7kX6GLt
zxFogL^t)W-_<BdHy-DLzd&;fb;i`{^mcX2RVv`6y(yfJ5FYKM>dGnNl`q3Cv`Usul
zD78FE4ppt+@b(rsZW((WaiXZ#FP)@F6b88-Wp|yaF1qcd>b5&^l>UM`ap||AD~e2+
zxGX|!_st~`t8$D?MOT-AGgl=P%te{!PQJy9_Oc;G{G;U_a8<{uO#fcvQRzz)l2tXJ
z+7os8;DAkzQO5UDeaUCnY@cU)P-T-L=GAWKzZccyQ3Uf75f7Bz7;<h3_^M^nw3EKx
zdbC35wSB<z8hr7TYJ5O{g^+U0ajSK)EgEKA=DcC{{PY8*owPcXc<SuP1@xj6W1S}^
zmD3B)PQW)yJkEthQoVj}{_CXXnV^7Ssr8IAE&C@w@kSg~V{=<i`?Wd-cV@8TV7_bJ
z;jaQ{R*w$0Hj^ircOn;!vklhQw8clh>$iVkG1H6e&S=vs`67fk^yqNek?W{k*l~_g
U0v_c9{YL=cL-nUf$x-}&16+6esQ>@~

literal 0
HcmV?d00001

diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@3x.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowLeft@3x.png
new file mode 100755
index 0000000000000000000000000000000000000000..849b991336c0c2e85017ce29be00eb8a8e50f3dc
GIT binary patch
literal 1815
zcmV+y2k7{TP)<h;3K|Lk000e1NJLTq001Na002J-1^@s6h!JYQ00001b5ch_0Itp)
z=>Px*(Md!>RA>donO$fcRTRhXo!umxkNqU+M>e~&o9zdcN}y6duoRn8X-i96`>DlZ
z5evokp$`>Q^r@f^MHK8qQ7p7jq10+MwMk==244h05b?o>Y<6ao&}cBbTWXTc&RqX@
zn+-E}caz=hY&tJ<&pE?6zd85ZkGVt06TF(6o1Kwh@EssXISgB_vE27|uh;ExI(rC}
zPWs%Q@MJRaJs8*%0SX3#Ua8K}ODTOen+QreydL-3$z<~OvIDiXwfSl#sShyE7<+{h
z`n1>WnWRQ#wcD+&t<8>_+Mf`#LyW};yA@TGV|LL{EjhAs<qBr6=>yEhycmq!h^oqQ
z=rhX#6lw{rA`aG%ZrLEhAT!qia{_ve+o}!}2n1Rsi3|`z*NHHMk*k0?3B8`P&5!?_
z!pb{pCQwVIL3C3d3^Mc8kQy_=@Yq$$P<Zufnc8ax2&G~1B^e`^k(txbGtpKRAX%2f
zsFwj`Miv7yon4B?m9vFl__LOG8RnTac1C$O<-;)Y8DP#7gW*7yW~kloUq>Yyx{0)M
z=cY?%7XfqLq$?m;1|+YRH{kX9F`8D1aTwD-j>gq@MSUUJ5}-&Ru#riWPkJlFAiB;j
z49C?EM13*2;u;G3{T*1bc>(9aU=V#c99K$);gA(&2%~8eWuzBF+b6y;hW2|H+8>Gf
z#pERewFd&5F^lwI)%J=(bi&RLtI9=DUy8gWppZZGJSL28bdy^Qg3O!)%%`HhRJm**
zY&l=Vu)d1`PGb<pFG|h==8{ogZo4d?a3HW1!}<<_G#LXuW?`qJih9|oUrM{=9b-h6
zJ2?z$rqLJ(Fgh}GDyphq81+kSqYM_m!olDUtWCE8Q*V4a3q#n+VO70q)K}78w96uG
z@-9Z{Es#5mfdHdn7jt5GM7?g*SK3|>s680mgE{6VVCqbP7|UQka~v=?OnM81qBC_U
z5ZX_v^bKN|VF;N;%^X8FSq{VBr(lLqGlwKfcvsZ$hYVL*)3qb9c>K0OXK6DJC=v)A
z!y0rAQAFDey6GTb_^_|qWg7NjS$-3du3$8oV6e}e)^%+^x`|JSRlVkG2ry?PLcauz
z2@<1eiZFdIGSgF4k~!zuOtc3==P;5!5d#9|k*1No%BVUZ+Nvc}Wae#T=5sLsU>IPw
zE2GM?!EgqNW-`5mu~88ST}N$pateA=J&Dg*EoYYwd|gIrX?AlS5Cb4lH?h%r4f<Kp
zRt-4|#2xc*DO-_mDNF<34Jpb|JeIBogwf|b5Lf#B{<b<>O+Te%t??n=My9%usY7Va
zh&C%_6A*XI4+m-_8%`?7dNB|t#=E*gUx|^}v}m(R&I96(`SFRZp7mj2eM$_3EoyIC
z&+Ho+8JQAoR><=cqtRLHpV$L3GrbML|1j!#8{N61R<d>BWTQc}Ss@n$;*N*L$N!$r
zq&u-}{4NH<jL_+@*WPVuX)$eO#pjkH7X{+Z#>U1b(pshy75$s&9GTkctZ(S%XU(Fm
z61iXvi4H@akVkTndw|$1+A#ipVX4&4=;UNF-&Ve+Bp~kA=kvL|PG>i&=mjwhYVB7&
zMP802VhPb!u3Rz@cg(xT)zJ7OYG_MdAav`DuI<3+`!~;4hGM}Q68%g}OgwxvGrbe~
zLD7ccx2e`<@8@UHdA2eXWdU)&<KyFxre@Q-F>~WA$b2E)9S)o;@-u0(rF5xmAnqEY
z@4vLJ?LqC_6GNdpHxh^Ae)eoyG?pNjRYL{*)wRnqzS-z*(T4f!uUTE|jK||+qHQ60
zNf|OYoWcKz1IW}523@v^H(k%qsQH2|+7^;41>(NbQ8jiD3-7mifhb+$u-OOsnRTA6
zh@#RiGrF}$f}!g;syS>_@;16p(Foh7D9W&C6J;whl=GRvuYy;RsjqX2+#PQ%^RsKd
zGtKFW-K_-TF*MZF>sb4)<prc9``?3~W#`!p3af#*Yi&qX-aw|V7~(u`QtBr*`~B>h
zcAjzWks^94)HD*5FJlIOOLT^s8qY9&yQ->xiZ;_%s%WfK#!uZY{M=oEdCIg)KutB-
zC_U_PHuWS@sc~bRssiyqfV$&xdwkfsJZB7yb|Yr>Bd$hIZ}MUCLC#inARZ`@Omrht
zE@aBQb)mF@O5}*w<?5SErLr^nvH)=?Wa=J%gV!TdrmYLIRF7X1N8Qe*0d(J}l@lY6
zyXb|}+zZ&`y<gzLREDr!%a)-W05a9@b-OV5=u0`>+?`_n>RNUn9vo1E9+!I-P}}EV
zW{AcP;Gf!^Cj!JF5~<|RKDTQMbJ7-^z3+>TsM!Ot{{dv1C-l#MaIOFV002ovPDHLk
FV1gYbUD*Ht

literal 0
HcmV?d00001

diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight.png
new file mode 100755
index 0000000000000000000000000000000000000000..0b2ee76e268a72c50211e5704147e37b9e62c3ad
GIT binary patch
literal 943
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eU!3HFY*6?ouQY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MQ<;1OBOz`!jG!i)^F
z=14FwFh*vEM3hAM`dB6B=jtV<<R_)-Rpb@`RWmTyR9FF-xv3?I3Kh9IdBs*0wn|_X
zRzNmLSYJs2tfVB{Rw=?aK*2e`C{@8!&qU8a$&O1wLBXadCCw_x#SN+*$g@?-C@Cqh
z($_C9FV`zK*2^zS*Eh7ZwA42+(l;{F1**_3uFNY*tkBIXR)!b?Gsh*hIJqdZpd>Rt
zPXT0ZVp4u-iLH_n$Rap^xU(cP4PjGWG1OZ?59)(t^bPe4^x<X$wc3D0t^A8JQ-L;v
z%(pYN0joq2gW6-G53(G|F%X}EMS)(m<Fe6*2b&$2&mr|lU?3mxba4!^5Nw@f?ak~c
zaQyv5(|w!713O!ul)d{lDPiuhPa7_IX$$J;usB{kbm-8r_lZx%1q3&45a7*NsL+v6
z`GeOb*h}vDnP=xzo-ATM{qD@4f4ettUTx`=<0<X8W!=oXPamAR;Jo*U#BH~WnN#u}
z+JvOkUE80hlh<o7?bdUf;9qO5pAQspQ=0YL=WWZP=<al%X-U;LdFH$S=h18mwzyTx
zRnlYe;8sD*#JCq+j!da_?jn_UUxq(nl$pr!zC>{Of1#Hwo{D@^JuJdstlIQnbf>FD
zhu^Mcz9(w#FSq8En7Z6+%C^1ng{c~>cNh<7O!WM_>|H>n)wUm+r+>C5&e&abBW}j5
zdHZ~XF1UHMsLs$|zrH`R`?HC6{ub%8Hmbt9>%^rubS!RE7H~TApIv|YfrI6Z<$Dgt
z2(9@YwOn`;gSYDOqukvK=A1t-5VJNcay>`lS5Xtr4N?d5x8?f(<*as%czNK%vt8?^
zawG?odW$9Qy`%Yfr%~`pm4hO|8`7<_Q`_ZER-SuWBz!obEBnVqv(v9!=e9d7G;rIv
zW9^oA#(#{h4c}D8&6?z#ct&#8y?ME2(cc$Oe%$RSP$L|(`s%FO-QO(ibp(s|NY!Nm
Qa~K1Ir>mdKI;Vst007Ws#Q*>R

literal 0
HcmV?d00001

diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..c8b9a874cf27641b060ff537de958ca197896774
GIT binary patch
literal 1786
zcmY*adt8!P8vgJWg4as%-Y20Zt{`fK1S(2~ZCEi{ikCzMMN<qY)Xhp$!)t2J<Rm5Q
znC6(Klb1;++A+K|mX%rUObt1t2^o1C%iHE+we9Zt{myyc^PJ~A&-<Q#PX4~2U4}3#
z7ytl<fm8}z6D>3o4b{`E4ZT%SnxGR;rjY@l^(=gasjJz8u~a$@05Ti_;8YF(ENP%q
zN&q<O1^}<40f0~m0Ekp^*M6erKtGil#s>iShP4R+E{HYikT6bgs34TKhY-t6#xUc!
zF)U14a;k<60K_zcCQW7um|$A+;S@e0jfDKjAZYS67>fiyQUpmPWGHPP=+EV`z^xch
zj2qG$27(}w7sn>hDFL6aYjz}Lf<TZ;z+#0$Ax7wd;qv0KI4>_RteZR5-Q88gaOJ0`
z2$*TEDg4c!ME;{gVew;moKyjan*y%sGGn+$1tcVL&FIVcRHuN${;yLC|8rZK2C-`=
zSRBR;`$b!GmAHly_VPF^jq{qmH;(v``G44FA0l?m{C|r1)agf5)2cU&i2d?x-mpDA
zPGJC`3lF4_gQ<p1=fk<yJ2&=E+-3ZomN?b?2%dPDtFHA!qs=H0HRxzCF+(4H#Z@aG
zW*@AtZ?_B?)t=6g!KZt)sU}-!ft*HBon*Z|MxpJAYlWCmUq*Iwbc*8_s^^<Ss${Jf
z?e56u-wdq^Q#`uOwYHV+R;z?!A-$pE-YsUpe9H`X^F=DrH|}_xMV|*s=KZL{G4g4o
z5t#8E)Y;(WkDg=lf?=0(r6f3mXm_?BjL-+IV=S5{B3ol#89A#=n|ceF16j1lNdKz8
zbvX@=&(Z-Ee*I88CgW`_>%ud`nq6ifr6Ru+H?rY(UPmzc_urs75QuCCxBn_W&}x`*
zu(qPxVEyg7<mz3tU;fC%cd(>*HuX5Z9R3Zbe_!Fh4D8EG9>n0Ks!REb;bGeI4e}T6
zIZiD{O8f^LD8t3nJj?7hhp(B$8#n4Fv=S8xX$NR8F?DBEu@T5LB=sN?$vPJ9xinr(
zzmv3%=OlqBGLr*n+U)~cH7Ls+W!KBDSay%4%VQc#1AJ{|uIcBSDlb3m*&AXnz;b3h
zVXJ1aLx**Lu#y;M_Z-5}<~mSb3jf;Y<lSc(q#5VVHy>`=#ku<0>J-j|Z#-d{>jQ`!
zojc1$*1btsiD?avNYLZxT{#VwHy#-IORQ;$BD?QMqsi-1+u|U^UoTH4k)LRf`0tkQ
zd0u3u`_O(9l6B2o(DKx?-kdab|1sDE_(8XY+ZSAVf0Oks9HoS=2Au!(pHU@$GM;Qd
zwUTB3<f=NdNh`GQ-WiFb4_H1aiYr<NX$8D&uHWUfrP|g;`a<m~vzw8NhGlL#N1eV(
zB;`@rCV_UbCr}rGL=(y^pU56JeR}<aqypzqih0)6rR>tp6Tq&J3mo1f28-^+jBX*o
zmr=<-^T!jOyPx!{;GYOud~4(?zUHAnQR$}4GzdKfZIWrdo<&bdtZ^hf-h!F+td>ok
zw3g!S7{ijLIOVdxF(ErHSF{J-s=x;kkV+4ckMf#8yd@-^kEuR6STC%xD{wk@=Y(jl
zFW*>pqpYFku`0rQb=%}I9cZsdzAR;Ae$H2nK)fSo61MwH6~62|Y;96dFRYuoohLNP
zyk7OFN5N1%<>xL67i~6edu$F`kBMLCn5jIb#l2yoiU(Xz(K3Rem!qH#M(v!nv6Ab{
z9+oX_9G-=ouGE|BT}0W8&awMSuGTIOFK?;2?@P25xm;GYM|i)tYd*u+dc-_JXdBm9
z+~PipHxBftJ(0CX?PuJy5uG6%RTw}Uj!Q4h9H8GpoimQz?%z2;8C|>;`h7inZqfM2
z#on-mlM0KZ-|D0b%~EMU)hd4f19jGd&-4mvY2~ZCT(sO^wD5gBeR&3WW%j!8b}y@K
z(B+0-k|GImd`95Dh?m{+9a4Wkv1BeUi4wbvIWlI%y}w#LYrF7`tobU6WOToAHLXpW
zFRrFkcRI+S)4d)IBhX{vn1qVKx?D_I-NZFB7y_3y^|J?SKKqC0?{d{4^Tcm$a;NbO
zmtVH~*<ibua+7io?N}dg7-Z^?w(R#RY91d__T7$%e#DT)zFc^-vcf8AS9`r$=u^Nr
zmZ!U`|1p;`W~(}o=K9d-t;xh{QscYy5Vm@XO8A-px$l$b_5tR5VDeVW%B9l_!pc|m
zDQeZ^Au@uFAWj@4zgrRh)Uc^LT(Ol{ljeMm$J5Rn+UGWK>4n*{v5~XqR3x?K+}aNl
MxHE{->=&K=Z!8)8l>h($

literal 0
HcmV?d00001

diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@3x.png b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/IQButtonBarArrowRight@3x.png
new file mode 100755
index 0000000000000000000000000000000000000000..95c43973b283158e67081158220a7f6d6edb8c8b
GIT binary patch
literal 1844
zcmV-42g~@0P)<h;3K|Lk000e1NJLTq001Na002J-1^@s6h!JYQ00001b5ch_0Itp)
z=>Px*?ny*JRA>donR{#$MI6Ux_pUt(z1_W&(#N%T*Q+STS7Lk+U*RDLDdAb#g!l-?
z_=nM$7&Ruwm>4xN#+VpmjQWox_(Baa2*{(QC<FyW5D}1Gd)rG}ZNuGOr9j)e@jI2h
z+na5VyWZ|O3GB@8x1I0jzB4<s4?;4<(G&>0-Z*DYbtY8$ns7zZ8S)1{69l1!5_&pG
z$f8Ij(qDQULPUs`!I>=#h5-mfnCGBEXMKIW?|%Ub`TfrVW3^FS5XfAY=;*Agt7|aE
zOHpS-Ru&2bK8G`Fc|i<cPwKL;uxFsBhtJv7W<xd>jzroBC13I)fDDQ*(&_j6LwwGz
zHUna1yi4ub07pLkubKHD7W&JG&>5<)pPPx=SJQ!*LK03r45v1k<OHE!5FPs(>*}sI
z<tz^9m%XuD5p(Jz4A*1EAgjZ{fpJO~tEzg6&so(rI;8iRf>Vz}{X;#V9|2k86vPe;
z-_3f=>Z4<-4r5yUJC7vK#`<)p@f=t>3$gV|W#z8;@bF*8oE7ycfmr9UgtpxyD;}&%
z^RvVRVI~p8R!LFzXqsl}ik=f_0!oYT^h$Ci5rn&qP;jXNZnb$NsXdlR^ci!-)UOIO
z0hQ2pdt_+_AnrAaVNM|?wn>$8r#7rbjk)R8^8%WH(zLybBs&3hKPToAMWGeIKg2Xm
z<#Gi#^9Eu)#}itISCLcL`xbIaF0|WZxBEamk%(})f|>;Zv7X_=eoXXHO!UP@B{)}(
zf303cIfQe%jk!YV1p~3pu_XMcDDnl&p`}JK0F_ZnS`|q;45zw`xqR!>0%D!VHSHjr
z(%{rGqZot2L~r%F<)c_O&KYz0)Ta%^I)_t-;M5RS_2mG;Dv&NtB4Y8BrQ-lUn~vsD
zDGG@755dD;SstK-G;>f6v|HfRNjP;n50;5jiUwl6U=kly6eS9$R`5``Ctjz>@@atQ
zwIN#q#GoK}3{FMh)XFR<Oemz+dL_@<SR#Isotvvz2E;_*)NzlZbit`rfJ)y<usUvC
z*1)MSz)zG6=nB+tvLu}m*@FWIh5TwbrNXISr-HK7AzcJ((C={S6xOLVh@~~yP{OHI
zaH<bZ{i2_5Jf=@J2Cb-L`2LV3_X$xD+0#r~he4se!XtV9hEqp)t@Md}!iqMWI^$8~
zV{mF6`g7`iGALj*W1Tt=r+(Js>}V?x6M$2H%5LQdrg#giNkg$5sFq{19>F;WS(_Ex
zftW}<5kH69lb=vs4~Q}r%M@V=ppt;v&tfG3VnPrMOO?t&3{?xD%2_N^ghkjF1#Ct8
zjQdX}Z(}W3A6y`cbT6RN>y$2+BJ}yJG1U_`9z};pHX7F_T?;F`nxyobQUW>f0J;eP
z8*~W$NGa{6W1|bz{{Bd*fSgVK;AQ}{>JaH8rROe<k1gu!@9$-?QUFc7?t#`MuY1Vx
zk<rUb1_lNObwIm;%Hhlwh^^EGGe>%CG?{z=Fy}KddmVD&z2(=qA8IxVvO4C>k#Rzo
zMx)UfpR>iGAPLTJ_{mnlJje?I=MWiAEK_4K&78BrA-pWDz&i6SF6{?+K{#_DF>+z~
zP%Jjg=k&Iv4pmoI&vH2&+ptS5&;|4(9*_19UmR&38XEdXk4<*845+HAs&baAVmn0c
zGYioUT-qxJ2M0&Yx$KA~Kwhs`k}78Iz?{i?L&Bus%<j=ta#den-^Fa{$y-GOg*+aa
zxTWvW{at1Wx-+E;Yoa82$()-!QWOwg7ke;Yc43FUo$nqKcw1PFv><+&&*f^HcHCSi
z8*@IN?;1Qavt8Q+gMr!#7<QLf5De>oS`O9J)Ks~gWqa`Vx3Er(1<rg07`B0q8RPlZ
z3kG7Juf%fKUI^T15~1V^z&wQbxG9%spdg??AW)0>(vEpEkMAGOYzEAuh$s16A?>{9
z5c^!^Ai_R8L6~4tlzal1M~a1E;CTVD&s6Ml72LVb^lK^oxLfVnh&W#L6<@A8WR118
z0l`_;fxW4bm!mZGL0DCvL>zaZ)|8w;?6VZ^#oOUbz$BNV?}dBSr%mx915*we=FGM1
zv(#iTcs_rpt2bgf4ErsUI>bIhiK3$&!&Jxr;1s2Ab*qsV__$SV6HuTwa08w#*`-}$
z7NKtd<|T97x=0pKQ$xc|RK#{b$Q)h*yY{QNv|r)lR=3kYjXvM4_`<UXFtg1f^ku-j
zW{z7QnE=8Hd>h^*?Z%w(@)EeTU&N*TCLgz}?F=<E+=0$_Vb@l8kyMI4*WIhW&ByI*
zJF%iw;EkjccYE1|rk(-JyV*heTN4;fe*Zm~KRY1j#wLknhCCJSjl6Had=7=6FE}3$
icIN^2M2^#JPyGuT_$vh|E;rZ!0000<MNUMnLSTYRtY*0Y

literal 0
HcmV?d00001

diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/de.lproj/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/de.lproj/IQKeyboardManager.strings
old mode 100644
new mode 100755
similarity index 100%
rename from Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/de.lproj/IQKeyboardManager.strings
rename to IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/de.lproj/IQKeyboardManager.strings
diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/en.lproj/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/en.lproj/IQKeyboardManager.strings
old mode 100644
new mode 100755
similarity index 100%
rename from Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/en.lproj/IQKeyboardManager.strings
rename to IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/en.lproj/IQKeyboardManager.strings
diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/es.lproj/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/es.lproj/IQKeyboardManager.strings
old mode 100644
new mode 100755
similarity index 100%
rename from Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/es.lproj/IQKeyboardManager.strings
rename to IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/es.lproj/IQKeyboardManager.strings
diff --git a/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/fr.lproj/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/fr.lproj/IQKeyboardManager.strings
new file mode 100755
index 0000000..584cd1c
--- /dev/null
+++ b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/fr.lproj/IQKeyboardManager.strings
@@ -0,0 +1,13 @@
+
+"enabled"             =   "activé";
+
+"disabled"            =   "désactivé";
+
+"already disabled"    =   "déjà désactivé";
+
+"already enabled"     =   "déjà activé";
+
+"You must set UIWindow.rootViewController in your AppDelegate to work with IQKeyboardManager"  =   "Vous devez définir UIWindow.rootViewController dans votre AppDelegate pour IQKeyboardManager fonctionne";
+
+"Previous"                              =   "Précédent";
+"Next"                                  =   "Suivant";
diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hans/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hans/IQKeyboardManager.strings
old mode 100644
new mode 100755
similarity index 100%
rename from Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hans/IQKeyboardManager.strings
rename to IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hans/IQKeyboardManager.strings
diff --git a/Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hant/IQKeyboardManager.strings b/IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hant/IQKeyboardManager.strings
old mode 100644
new mode 100755
similarity index 100%
rename from Clutch/IQKeybordManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hant/IQKeyboardManager.strings
rename to IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle/zh-Hant/IQKeyboardManager.strings
diff --git a/readme.md b/readme.md
index ec4ca8e..fd37d95 100644
--- a/readme.md
+++ b/readme.md
@@ -4,6 +4,7 @@ Clutch is the name for the Solinor Payment Highway iOS SDK (actually it is a .fr
 
 ## Requirements
 
+* At least Xcode 7.3
 * You have an existing iOS project supporting iOS 8 or later
 * [Carthage]( https://github.com/Carthage/Carthage)
 * Valid SPH account id and merchant id
@@ -39,7 +40,7 @@ github "solinor/paymenthighway-ios-framework" "v-1.0"
 
 2. Run command
 ```
-carthage update
+carthage update --platform iOS
 ```
 
 3. Follow the Carthage's instructions for ”[Adding frameworks to an application](https://github.com/Carthage/Carthage)” from steap 3 on "If you're building for iOS"
@@ -61,4 +62,4 @@ Code Sign error: No code signing identities found: No valid signing identities (
 CodeSign error: code signing is required for product type 'Framework' in SDK 'iOS 8.4'
 ```
 
-then make sure you have iOS distribution license installed (Xcode->Preferences->Accounts->View Details->Signing Identities).
\ No newline at end of file
+then make sure you have iOS distribution license installed (Xcode->Preferences->Accounts->View Details->Signing Identities).

From 5a80caefb3f540204ac9c37b20d49f545a3861d1 Mon Sep 17 00:00:00 2001
From: Juha Salo <juha.salo@solinor.com>
Date: Tue, 5 Apr 2016 20:36:19 +0300
Subject: [PATCH 02/11] Updated IQKeyboardManager and fixed errors.
 Crypto.swift fixes needs review.

---
 Cartfile.resolved                             |   2 +-
 Clutch/Crypto.swift                           |  12 +-
 Clutch/Extensions.swift                       |   2 +-
 Clutch/SPHClutchFormatter.swift               |   8 +-
 .../Categories/IQUIView+Hierarchy.swift       |  14 +-
 .../IQKeyboardManager.swift                   | 356 ++++++++++++------
 .../IQKeyboardReturnKeyHandler.swift          |  24 +-
 .../IQTextView/IQTextView.swift               |  17 +-
 .../IQToolbar/IQPreviousNextView.swift        |  28 ++
 9 files changed, 307 insertions(+), 156 deletions(-)
 create mode 100755 IQKeyboardManagerSwift/IQToolbar/IQPreviousNextView.swift

diff --git a/Cartfile.resolved b/Cartfile.resolved
index e8d824c..42b54cf 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Alamofire/Alamofire" "3.3.0"
-github "krzyzanowskim/CryptoSwift" "0.3"
+github "krzyzanowskim/CryptoSwift" "0.3.1"
 github "Quick/Nimble" "v3.2.0"
 github "Quick/Quick" "v0.9.1"
 github "SwiftyJSON/SwiftyJSON" "2.3.3"
diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index b32860a..fc80919 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -18,21 +18,21 @@ public func getRequestId() -> String {
 /// - parameter   DER-formatted: certificate
 /// - returns: SecKeyRef or Nil.
 private func loadDER(publicKeyFileContent: NSData) -> SecKeyRef? {
-    let certificate = SecCertificateCreateWithData(kCFAllocatorDefault, publicKeyFileContent as CFData).takeUnretainedValue()
-    let policy = SecPolicyCreateBasicX509().takeUnretainedValue();
-    var unmanagedTrust : Unmanaged<SecTrust>? = nil
-    let status = SecTrustCreateWithCertificates(certificate, policy, &unmanagedTrust)
+    let certificate = SecCertificateCreateWithData(kCFAllocatorDefault, publicKeyFileContent as CFData)
+    let policy = SecPolicyCreateBasicX509()
+    var unmanagedTrust : SecTrust? = nil
+    let status = SecTrustCreateWithCertificates(certificate!, policy, &unmanagedTrust)
     if (status != 0) {
         print("SecTrustCreateWithCertificates fail. Error Code: \(status)");
         return nil
     }
-    let trust = unmanagedTrust!.takeUnretainedValue()
+    let trust = unmanagedTrust!
     let evaluateStatus = SecTrustEvaluate(trust, nil)
     if (evaluateStatus != 0) {
         print("SecTrustEvaluate fail. Error Code: \(evaluateStatus)");
         return nil
     }
-    return SecTrustCopyPublicKey(trust).takeUnretainedValue();
+    return SecTrustCopyPublicKey(trust)
 }
 
 private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
diff --git a/Clutch/Extensions.swift b/Clutch/Extensions.swift
index 8e9a6a0..f8931d4 100644
--- a/Clutch/Extensions.swift
+++ b/Clutch/Extensions.swift
@@ -50,7 +50,7 @@ internal extension String {
         var strings = [String]()
         
         for result in results {
-            for var i = 1; i < result.numberOfRanges; i++ {
+            for i in 1 ..< result.numberOfRanges {
                 let range = result.rangeAtIndex(i)
                 strings.append(nsString.substringWithRange(range))
             }
diff --git a/Clutch/SPHClutchFormatter.swift b/Clutch/SPHClutchFormatter.swift
index f532624..85e30b5 100644
--- a/Clutch/SPHClutchFormatter.swift
+++ b/Clutch/SPHClutchFormatter.swift
@@ -138,10 +138,10 @@ public class SPHClutchFormatter {
 						if let match = pattern.matched {
 							let src = text[range]
 							let srcLen = src.characters.count
-							var replace = match(src,text,pattern.start)
+							let replace = match(src,text,pattern.start)
 							if replace.attributes != nil {
 								text.replaceRange(range, with: replace.text)
-								let replaceLen = replace.count
+								let replaceLen = replace.text.characters.count
 								index -= (srcLen-replaceLen)
 								lastChar = char
 								pattern.length = replaceLen
@@ -171,9 +171,9 @@ public class SPHClutchFormatter {
 			index += 1
 		}
 		//we have our patterns, let's build a stylized string
-		var attributedText = NSMutableAttributedString(string: text)
+		let attributedText = NSMutableAttributedString(string: text)
 		for pattern in collect {
-			attributedText.setAttributes(pattern.attributes, range: NSMakeRange(pattern.start, pattern.length))
+			attributedText.setAttributes((pattern.attributes as! [String: AnyObject]), range: NSMakeRange(pattern.start, pattern.length))
 		}
 		return attributedText
 	}
diff --git a/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift b/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
index 3a9c1c8..a916bdf 100755
--- a/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
+++ b/IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift
@@ -198,7 +198,9 @@ public extension UIView {
             
             if textField._IQcanBecomeFirstResponder() == true {
                 textfields.append(textField)
-            } else if textField.subviews.count != 0 {
+                
+                //Sometimes there are hidden or disabled views and textField inside them still recorded, so we added some more validations here (Bug ID:
+            } else if textField.subviews.count != 0  && userInteractionEnabled == true && hidden == false && alpha != 0.0 {
                 for deepView in textField.deepResponderViews() {
                     textfields.append(deepView)
                 }
@@ -268,10 +270,12 @@ public extension UIView {
     /**
     Returns current view transform with respect to the 'toView'.
     */
-    public func convertTransformToView(var toView:UIView?)->CGAffineTransform {
+    public func convertTransformToView(toView:UIView?)->CGAffineTransform {
+        
+        var newView = toView;
         
-        if toView == nil {
-            toView = window
+        if newView == nil {
+            newView = window
         }
         
         //My Transform
@@ -286,7 +290,7 @@ public extension UIView {
         var viewTransform = CGAffineTransformIdentity
         
         //view Transform
-        if let unwrappedToView = toView {
+        if let unwrappedToView = newView {
             
             if let unwrappedSuperView = unwrappedToView.superview {
                 viewTransform = CGAffineTransformConcat(unwrappedToView.transform, unwrappedSuperView.convertTransformToView(nil))
diff --git a/IQKeyboardManagerSwift/IQKeyboardManager.swift b/IQKeyboardManagerSwift/IQKeyboardManager.swift
index d7b8ceb..4b1f446 100755
--- a/IQKeyboardManagerSwift/IQKeyboardManager.swift
+++ b/IQKeyboardManagerSwift/IQKeyboardManager.swift
@@ -70,6 +70,46 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    public func privateIsEnabled()-> Bool {
+        
+        var isEnabled = enable;
+        
+        if let textFieldViewController = _textFieldView?.viewController() {
+            
+            if isEnabled == false {
+                
+                //If viewController is kind of enable viewController class, then assuming it's enabled.
+                for enabledClassString in enabledDistanceHandlingClasses {
+                    
+                    if let enabledClass = NSClassFromString(enabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(enabledClass) {
+                            isEnabled = true;
+                            break
+                        }
+                    }
+                }
+            }
+            
+            if isEnabled == true {
+                
+                //If viewController is kind of disabled viewController class, then assuming it's disabled.
+                for diabledClassString in disabledDistanceHandlingClasses {
+                    
+                    if let disabledClass = NSClassFromString(diabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(disabledClass) {
+                            isEnabled = false;
+                            break
+                        }
+                    }
+                }
+            }
+        }
+        
+        return isEnabled;
+    }
+    
     /**
     To set keyboard distance from textField. can't be less than zero. Default is 10.0.
     */
@@ -114,7 +154,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         didSet {
 
-            enableAutoToolbar ?addToolbarIfRequired():removeToolbarIfRequired()
+            privateIsEnableAutoToolbar() ?addToolbarIfRequired():removeToolbarIfRequired()
 
             let enableToolbar = enableAutoToolbar ? "Yes" : "NO"
 
@@ -122,6 +162,46 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    private func privateIsEnableAutoToolbar() -> Bool {
+        
+        var enableToolbar = enableAutoToolbar;
+        
+        if let textFieldViewController = _textFieldView?.viewController() {
+            
+            if enableToolbar == false {
+                
+                //If found any toolbar enabled classes then return.
+                for enabledClassString in enabledToolbarClasses {
+                    
+                    if let enabledClass = NSClassFromString(enabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(enabledClass) {
+                            enableToolbar = true;
+                            break
+                        }
+                    }
+                }
+            }
+            
+            if enableToolbar == true {
+                
+                //If found any toolbar disabled classes then return.
+                for diabledClassString in disabledToolbarClasses {
+                    
+                    if let disabledClass = NSClassFromString(diabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(disabledClass) {
+                            enableToolbar = false;
+                            break
+                        }
+                    }
+                }
+            }
+        }
+
+        return enableToolbar;
+    }
+
     /**
     AutoToolbar managing behaviour. Default is IQAutoToolbarBySubviews.
     */
@@ -199,7 +279,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     public var shouldResignOnTouchOutside = false {
         
         didSet {
-            _tapGesture.enabled = shouldResignOnTouchOutside
+            _tapGesture.enabled = privateShouldResignOnTouchOutside()
             
             let shouldResign = shouldResignOnTouchOutside ? "Yes" : "NO"
             
@@ -207,6 +287,46 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    private func privateShouldResignOnTouchOutside() -> Bool {
+        
+        var shouldResign = shouldResignOnTouchOutside;
+        
+        if let textFieldViewController = _textFieldView?.viewController() {
+            
+            if shouldResign == false {
+                
+                //If viewController is kind of enable viewController class, then assuming shouldResignOnTouchOutside is enabled.
+                for enabledClassString in enabledTouchResignedClasses {
+                    
+                    if let enabledClass = NSClassFromString(enabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(enabledClass) {
+                            shouldResign = true;
+                            break
+                        }
+                    }
+                }
+            }
+            
+            if shouldResign == true {
+                
+                //If viewController is kind of disable viewController class, then assuming shouldResignOnTouchOutside is disable.
+                for diabledClassString in disabledTouchResignedClasses {
+                    
+                    if let disabledClass = NSClassFromString(diabledClassString) {
+                        
+                        if textFieldViewController.isKindOfClass(disabledClass) {
+                            shouldResign = false;
+                            break
+                        }
+                    }
+                }
+            }
+        }
+        
+        return shouldResign;
+    }
+    
     /**
     Resigns currently first responder field.
     */
@@ -458,17 +578,54 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     */
     public var layoutIfNeededOnUpdate = false
 
+    
     ///------------------------------------
     /// MARK: Class Level disabling methods
     ///------------------------------------
     
+    /**
+     Disable distance handling within the scope of disabled distance handling viewControllers classes. Within this scope, 'enabled' property is ignored. Class should be kind of UIViewController.
+     */
+    public var disabledDistanceHandlingClasses  = Set<String>()
+    
+    /**
+     Enable distance handling within the scope of enabled distance handling viewControllers classes. Within this scope, 'enabled' property is ignored. Class should be kind of UIViewController. If same Class is added in disabledDistanceHandlingClasses list, then enabledDistanceHandlingClasses will be ignored.
+     */
+    public var enabledDistanceHandlingClasses  = Set<String>()
+    
+    /**
+     Disable automatic toolbar creation within the scope of disabled toolbar viewControllers classes. Within this scope, 'enableAutoToolbar' property is ignored. Class should be kind of UIViewController.
+     */
+    public var disabledToolbarClasses  = Set<String>()
+    
+    /**
+     Enable automatic toolbar creation within the scope of enabled toolbar viewControllers classes. Within this scope, 'enableAutoToolbar' property is ignored. Class should be kind of UIViewController. If same Class is added in disabledToolbarClasses list, then enabledToolbarClasses will be ignore.
+     */
+    public var enabledToolbarClasses  = Set<String>()
+
+    /**
+     Allowed subclasses of UIView to add all inner textField, this will allow to navigate between textField contains in different superview. Class should be kind of UIView.
+     */
+    public var toolbarPreviousNextAllowedClasses  = Set<String>()
+    
+    /**
+     Disabled classes to ignore 'shouldResignOnTouchOutside' property, Class should be kind of UIViewController.
+     */
+    public var disabledTouchResignedClasses  = Set<String>()
+    
+    /**
+     Enabled classes to forcefully enable 'shouldResignOnTouchOutsite' property. Class should be kind of UIViewController. If same Class is added in disabledTouchResignedClasses list, then enabledTouchResignedClasses will be ignored.
+     */
+    public var enabledTouchResignedClasses  = Set<String>()
+
     /**
     Disable adjusting view in disabledClass
     
     @param disabledClass Class in which library should not adjust view to show textField.
     */
+    @available(*,deprecated, message="Use disabledDistanceHandlingClasses NSMutableSet, this will be removed in future releases.")
     public func disableDistanceHandlingInViewControllerClass(disabledClass : AnyClass) {
-        _disabledClasses.insert(NSStringFromClass(disabledClass))
+        disabledDistanceHandlingClasses.insert(NSStringFromClass(disabledClass))
     }
     
     /**
@@ -476,15 +633,9 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param disabledClass Class in which library should re-enable adjust view to show textField.
     */
+    @available(*,deprecated, message="Use disabledDistanceHandlingClasses NSMutableSet, this will be removed in future releases.")
     public func removeDisableDistanceHandlingInViewControllerClass(disabledClass : AnyClass) {
-        _disabledClasses.remove(NSStringFromClass(disabledClass))
-    }
-    
-    /**
-     Returns All disabled classes registered with disableInViewControllerClass.
-     */
-    public func disabledInViewControllerClassesString() -> Set<String> {
-        return _disabledClasses
+        disabledDistanceHandlingClasses.remove(NSStringFromClass(disabledClass))
     }
     
     /**
@@ -492,35 +643,30 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarDisabledClass Class in which library should not add toolbar over textField.
     */
+    @available(*,deprecated, message="Use disabledToolbarClasses NSMutableSet, this will be removed in future releases.")
     public func disableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
-        _disabledToolbarClasses.insert(NSStringFromClass(toolbarDisabledClass))
+        disabledToolbarClasses.insert(NSStringFromClass(toolbarDisabledClass))
     }
     
     /**
     Re-enable automatic toolbar creation in in toolbarDisabledClass
     
     @param toolbarDisabledClass Class in which library should re-enable automatic toolbar creation over textField.
+     @available(*,deprecated, message="Use disabledDistanceHandlingClasses NSMutableSet, this will be removed in future releases.")
     */
+    @available(*,deprecated, message="Use disabledToolbarClasses NSMutableSet, this will be removed in future releases.")
     public func removeDisableToolbarInViewControllerClass(toolbarDisabledClass : AnyClass) {
-        _disabledToolbarClasses.remove(NSStringFromClass(toolbarDisabledClass))
+        disabledToolbarClasses.remove(NSStringFromClass(toolbarDisabledClass))
     }
-    
-    /**
-    Returns YES if toolbar is disabled in ViewController class, otherwise returns NO.
-    
-    @param toolbarDisabledClass Class which is to check for toolbar disability.
-    */
-    public func disabledToolbarInViewControllerClassesString() -> Set<String> {
-        return _disabledToolbarClasses
-    }
-    
+
     /**
     Consider provided customView class as superView of all inner textField for calculating next/previous button logic.
     
     @param toolbarPreviousNextConsideredClass Custom UIView subclass Class in which library should consider all inner textField as siblings and add next/previous accordingly.
     */
+    @available(*,deprecated, message="Use toolbarPreviousNextAllowedClasses NSMutableSet, this will be removed in future releases.")
     public func considerToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
-        _toolbarPreviousNextConsideredClass.insert(NSStringFromClass(toolbarPreviousNextConsideredClass))
+        toolbarPreviousNextAllowedClasses.insert(NSStringFromClass(toolbarPreviousNextConsideredClass))
     }
     
     /**
@@ -528,17 +674,9 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     @param toolbarPreviousNextConsideredClass Custom UIView subclass Class in which library should remove consideration for all inner textField as superView.
     */
+    @available(*,deprecated, message="Use toolbarPreviousNextAllowedClasses NSMutableSet, this will be removed in future releases.")
     public func removeConsiderToolbarPreviousNextInViewClass(toolbarPreviousNextConsideredClass : AnyClass) {
-        _toolbarPreviousNextConsideredClass.remove(NSStringFromClass(toolbarPreviousNextConsideredClass))
-    }
-    
-    /**
-    Returns YES if inner hierarchy is considered for previous/next in class, otherwise returns NO.
-    
-    @param toolbarPreviousNextConsideredClass Class which is to check for previous next consideration
-    */
-    public func consideredToolbarPreviousNextViewClassesString() -> Set<String> {
-        return _toolbarPreviousNextConsideredClass
+        toolbarPreviousNextAllowedClasses.remove(NSStringFromClass(toolbarPreviousNextConsideredClass))
     }
 
     ///-------------------------------------------
@@ -554,8 +692,8 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     public func addTextFieldViewDidBeginEditingNotificationName(didBeginEditingNotificationName : String, didEndEditingNotificationName : String) {
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidBeginEditing:",    name: didBeginEditingNotificationName, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidEndEditing:",      name: didEndEditingNotificationName, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.textFieldViewDidBeginEditing(_:)),    name: didBeginEditingNotificationName, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.textFieldViewDidEndEditing(_:)),      name: didEndEditingNotificationName, object: nil)
     }
 
     /**************************************************************************************/
@@ -615,17 +753,6 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     
     /*******************************************/
     
-    /** Set of restricted classes for library */
-    private var         _disabledClasses  = Set<String>()
-    
-    /** Set of restricted classes for adding toolbar */
-    private var         _disabledToolbarClasses  = Set<String>()
-    
-    /** Set of permitted classes to add all inner textField as siblings */
-    private var         _toolbarPreviousNextConsideredClass  = Set<String>()
- 
-    /*******************************************/
-
     private struct flags {
         /** used with canAdjustTextView to detect a textFieldView frame is changes or not. (Bug ID: #92)*/
         var isTextFieldViewFrameChanged = false
@@ -651,30 +778,30 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         super.init()
 
         //  Registering for keyboard notification.
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardWillShow:",                name: UIKeyboardWillShowNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardWillHide:",                name: UIKeyboardWillHideNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardDidHide:",                name: UIKeyboardDidHideNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.keyboardWillShow(_:)),                name: UIKeyboardWillShowNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.keyboardWillHide(_:)),                name: UIKeyboardWillHideNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.keyboardDidHide(_:)),                name: UIKeyboardDidHideNotification, object: nil)
         
         //  Registering for UITextField notification.
         addTextFieldViewDidBeginEditingNotificationName(UITextFieldTextDidBeginEditingNotification, didEndEditingNotificationName: UITextFieldTextDidEndEditingNotification)
         
         //  Registering for UITextView notification.
         addTextFieldViewDidBeginEditingNotificationName(UITextViewTextDidBeginEditingNotification, didEndEditingNotificationName: UITextViewTextDidEndEditingNotification)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "textFieldViewDidChange:",          name: UITextViewTextDidChangeNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.textFieldViewDidChange(_:)),          name: UITextViewTextDidChangeNotification, object: nil)
         
         //  Registering for orientation changes notification
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "willChangeStatusBarOrientation:",          name: UIApplicationWillChangeStatusBarOrientationNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.willChangeStatusBarOrientation(_:)),          name: UIApplicationWillChangeStatusBarOrientationNotification, object: nil)
 
         //Creating gesture for @shouldResignOnTouchOutside. (Enhancement ID: #14)
-        _tapGesture = UITapGestureRecognizer(target: self, action: "tapRecognized:")
+        _tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.tapRecognized(_:)))
         _tapGesture.cancelsTouchesInView = false
         _tapGesture.delegate = self
         _tapGesture.enabled = shouldResignOnTouchOutside
         
-        disableDistanceHandlingInViewControllerClass(UITableViewController)
-        considerToolbarPreviousNextInViewClass(UITableView)
-        considerToolbarPreviousNextInViewClass(UICollectionView)
-        
+        disabledDistanceHandlingClasses.insert(NSStringFromClass(UITableViewController))
+        toolbarPreviousNextAllowedClasses.insert(NSStringFromClass(UITableView))
+        toolbarPreviousNextAllowedClasses.insert(NSStringFromClass(UICollectionView))
+        toolbarPreviousNextAllowedClasses.insert(NSStringFromClass(IQPreviousNextView))
         //Workaround to load all appearance proxies at startup
         let barButtonItem2 = IQTitleBarButtonItem()
         barButtonItem2.title = ""
@@ -730,7 +857,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     ///-----------------------
     
     /*  Helper function to manipulate RootViewController's frame with animation. */
-    private func setRootViewFrame(var frame: CGRect) {
+    private func setRootViewFrame(frame: CGRect) {
         
         //  Getting topMost ViewController.
         var controller = _textFieldView?.topMostController()
@@ -740,15 +867,17 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         
         if let unwrappedController = controller {
+            
+            var newFrame = frame;
             //frame size needs to be adjusted on iOS8 due to orientation structure changes.
-            frame.size = unwrappedController.view.frame.size
+            newFrame.size = unwrappedController.view.frame.size
             
             //Used UIViewAnimationOptionBeginFromCurrentState to minimize strange animations.
             UIView.animateWithDuration(_animationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState.union(_animationCurve), animations: { () -> Void in
                 
                 //  Setting it's new frame
-                unwrappedController.view.frame = frame
-                self._IQShowLog("Set \(controller?._IQDescription()) frame to : \(frame)")
+                unwrappedController.view.frame = newFrame
+                self._IQShowLog("Set \(controller?._IQDescription()) frame to : \(newFrame)")
                 
                 //Animating content if needed (Bug ID: #204)
                 if self.layoutIfNeededOnUpdate == true {
@@ -774,7 +903,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         let textFieldView = _textFieldView!
 
-        _IQShowLog("****** \(__FUNCTION__) %@ started ******")
+        _IQShowLog("****** \(#function) %@ started ******")
 
         //  Boolean to know keyboard is showing/hiding
         _keyboardManagerFlags.isKeyboardShowing = true
@@ -1141,7 +1270,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             }
         }
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
     
     ///-------------------------------
@@ -1153,11 +1282,11 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         
         _kbShowNotification = notification
 
-        if enable == false {
+        if privateIsEnabled() == false {
             return
         }
         
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
 
         //Due to orientation callback we need to resave it's original frame.    //  (Bug ID: #46)
         //Added _isTextFieldViewFrameChanged check. Saving textFieldView current frame to use it with canAdjustTextView if textViewFrame has already not been changed. (Bug ID: #92)
@@ -1209,8 +1338,18 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             
             //  Getting UIKeyboardSize.
             if let kbFrame = info[UIKeyboardFrameEndUserInfoKey]?.CGRectValue {
-                _kbSize = kbFrame.size
                 
+                let screenSize = UIScreen.mainScreen().bounds
+                
+                //Calculating actual keyboard displayed size, keyboard frame may be different when hardware keyboard is attached (Bug ID: #469) (Bug ID: #381)
+                let intersectRect = CGRectIntersection(kbFrame, screenSize)
+                
+                if CGRectIsNull(intersectRect) {
+                    _kbSize = CGSizeMake(screenSize.size.width, 0)
+                } else {
+                    _kbSize = intersectRect.size
+                }
+
                 _IQShowLog("UIKeyboard Size : \(_kbSize)")
             }
         }
@@ -1230,31 +1369,15 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             if _textFieldView != nil && _textFieldView?.isAlertViewTextField() == false {
                 
                 //Getting textField viewController
-                if let textFieldViewController = _textFieldView?.viewController() {
+                if _textFieldView?.viewController() != nil {
                     
-                    var shouldIgnore = false
-                    
-                    for disabledClassString in _disabledClasses {
-                        
-                        if let disabledClass = NSClassFromString(disabledClassString) {
-                            //If viewController is kind of disabled viewController class, then ignoring to adjust view.
-                            if textFieldViewController.isKindOfClass(disabledClass) {
-                                shouldIgnore = true
-                                break
-                            }
-                        }
-                    }
-                    
-                    //If shouldn't ignore.
-                    if shouldIgnore == false  {
-                        //  keyboard is already showing. adjust frame.
-                        adjustFrame()
-                    }
+                    //  keyboard is already showing. adjust frame.
+                    adjustFrame()
                 }
             }
         }
         
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
     
     /*  UIKeyboardWillHideNotification. So setting rootViewController to it's default frame. */
@@ -1266,11 +1389,11 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         
         //If not enabled then do nothing.
-        if enable == false {
+        if privateIsEnabled() == false {
             return
         }
         
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
 
         //Commented due to #56. Added all the conditions below to handle UIWebView's textFields.    (Bug ID: #56)
         //  We are unable to get textField object while keyboard showing on UIWebView's textField.  (Bug ID: #11)
@@ -1389,16 +1512,16 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         _startingContentOffset = CGPointZero
         //    topViewBeginRect = CGRectZero    //Commented due to #82
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
 
     internal func keyboardDidHide(notification:NSNotification) {
 
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
         
         _topViewBeginRect = CGRectZero
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
     
     ///-------------------------------------------
@@ -1408,7 +1531,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**  UITextFieldTextDidBeginEditingNotification, UITextViewTextDidBeginEditingNotification. Fetching UITextFieldView object. */
     internal func textFieldViewDidBeginEditing(notification:NSNotification) {
 
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
 
         //  Getting object
         _textFieldView = notification.object as? UIView
@@ -1442,7 +1565,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         }
         
         //If autoToolbar enable, then add toolbar on all the UITextField/UITextView's if required.
-        if enableAutoToolbar == true {
+        if privateIsEnableAutoToolbar() == true {
 
             _IQShowLog("adding UIToolbars if required")
 
@@ -1472,10 +1595,12 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 //Adding toolbar
                 addToolbarIfRequired()
             }
+        } else {
+            removeToolbarIfRequired()
         }
 
-        if enable == false {
-            _IQShowLog("****** \(__FUNCTION__) ended ******")
+        if privateIsEnabled() == false {
+            _IQShowLog("****** \(#function) ended ******")
             return
         }
         
@@ -1510,7 +1635,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 
                 var shouldIgnore = false
                 
-                for disabledClassString in _disabledClasses {
+                for disabledClassString in disabledDistanceHandlingClasses {
                     
                     if let disabledClass = NSClassFromString(disabledClassString) {
                         //If viewController is kind of disabled viewController class, then ignoring to adjust view.
@@ -1529,13 +1654,13 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             }
         }
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
     
     /**  UITextFieldTextDidEndEditingNotification, UITextViewTextDidEndEditingNotification. Removing fetched object. */
     internal func textFieldViewDidEndEditing(notification:NSNotification) {
         
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
 
         //Removing gesture recognizer   (Enhancement ID: #14)
         _textFieldView?.window?.removeGestureRecognizer(_tapGesture)
@@ -1554,7 +1679,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         //Setting object to nil
         _textFieldView = nil
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
 
     /** UITextViewTextDidChangeNotificationBug,  fix for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string */
@@ -1589,7 +1714,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /**  UIApplicationWillChangeStatusBarOrientationNotification. Need to set the textView to it's original position. If any frame changes made. (Bug ID: #92)*/
     internal func willChangeStatusBarOrientation(notification:NSNotification) {
         
-        _IQShowLog("****** \(__FUNCTION__) started ******")
+        _IQShowLog("****** \(#function) started ******")
         
         //If textFieldViewInitialRect is saved then restore it.(UITextView case @canAdjustTextView)
         if _keyboardManagerFlags.isTextFieldViewFrameChanged == true {
@@ -1607,7 +1732,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
             }
         }
 
-        _IQShowLog("****** \(__FUNCTION__) ended ******")
+        _IQShowLog("****** \(#function) ended ******")
     }
     
     ///------------------
@@ -1620,7 +1745,7 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
         var superConsideredView : UIView?
 
         //If find any consider responderView in it's upper hierarchy then will get deepResponderView.
-        for disabledClassString in _toolbarPreviousNextConsideredClass {
+        for disabledClassString in toolbarPreviousNextAllowedClasses {
             
             if let disabledClass = NSClassFromString(disabledClassString) {
                 
@@ -1659,21 +1784,6 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
     /** Add toolbar if it is required to add on textFields and it's siblings. */
     private func addToolbarIfRequired() {
         
-        if let textFieldViewController = _textFieldView?.viewController() {
-            
-            for disabledClassString in _disabledToolbarClasses {
-                
-                if let disabledClass = NSClassFromString(disabledClassString) {
-                    
-                    if textFieldViewController.isKindOfClass(disabledClass) {
-                        
-                        removeToolbarIfRequired()
-                        return
-                    }
-                }
-            }
-        }
-        
         //	Getting all the sibling textFields.
         if let siblings = responderViews() {
             
@@ -1687,14 +1797,14 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                     
                     //Supporting Custom Done button image (Enhancement ID: #366)
                     if let doneBarButtonItemImage = toolbarDoneBarButtonItemImage {
-                            textField.addRightButtonOnKeyboardWithImage(doneBarButtonItemImage, target: self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                            textField.addRightButtonOnKeyboardWithImage(doneBarButtonItemImage, target: self, action: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                     }
                     //Supporting Custom Done button text (Enhancement ID: #209, #411, Bug ID: #376)
                     else if let doneBarButtonItemText = toolbarDoneBarButtonItemText {
-                        textField.addRightButtonOnKeyboardWithText(doneBarButtonItemText, target: self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                        textField.addRightButtonOnKeyboardWithText(doneBarButtonItemText, target: self, action: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                     } else {
                         //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
-                        textField.addDoneOnKeyboardWithTarget(self, action: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                        textField.addDoneOnKeyboardWithTarget(self, action: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                     }
 
                     textField.inputAccessoryView?.tag = IQKeyboardManager.kIQDoneButtonToolbarTag //  (Bug ID: #78)
@@ -1785,14 +1895,14 @@ public class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                         
                         //Supporting Custom Done button image (Enhancement ID: #366)
                         if let doneBarButtonItemImage = toolbarDoneBarButtonItemImage {
-                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonImage: doneBarButtonItemImage, previousAction: "previousAction:", nextAction: "nextAction:", rightButtonAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonImage: doneBarButtonItemImage, previousAction: #selector(self.previousAction(_:)), nextAction: #selector(self.nextAction(_:)), rightButtonAction: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                         }
                         //Supporting Custom Done button text (Enhancement ID: #209, #411, Bug ID: #376)
                         else if let doneBarButtonItemText = toolbarDoneBarButtonItemText {
-                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonTitle: doneBarButtonItemText, previousAction: "previousAction:", nextAction: "nextAction:", rightButtonAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                            textField.addPreviousNextRightOnKeyboardWithTarget(self, rightButtonTitle: doneBarButtonItemText, previousAction: #selector(self.previousAction(_:)), nextAction: #selector(self.nextAction(_:)), rightButtonAction: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                         } else {
                             //Now adding textField placeholder text as title of IQToolbar  (Enhancement ID: #27)
-                            textField.addPreviousNextDoneOnKeyboardWithTarget(self, previousAction: "previousAction:", nextAction: "nextAction:", doneAction: "doneAction:", shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
+                            textField.addPreviousNextDoneOnKeyboardWithTarget(self, previousAction: #selector(self.previousAction(_:)), nextAction: #selector(self.nextAction(_:)), doneAction: #selector(self.doneAction(_:)), shouldShowPlaceholder: shouldShowTextFieldPlaceholder)
                         }
 
                         textField.inputAccessoryView?.tag = IQKeyboardManager.kIQPreviousNextButtonToolbarTag //  (Bug ID: #78)
diff --git a/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift b/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
index 2906146..39ac043 100755
--- a/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
+++ b/IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler.swift
@@ -128,7 +128,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
         var superConsideredView : UIView?
         
         //If find any consider responderView in it's upper hierarchy then will get deepResponderView. (Bug ID: #347)
-        for disabledClassString in IQKeyboardManager.sharedManager().consideredToolbarPreviousNextViewClassesString() {
+        for disabledClassString in IQKeyboardManager.sharedManager().toolbarPreviousNextAllowedClasses {
             
             if let disabledClass = NSClassFromString(disabledClassString) {
                 
@@ -274,7 +274,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
         var superConsideredView : UIView?
         
         //If find any consider responderView in it's upper hierarchy then will get deepResponderView. (Bug ID: #347)
-        for disabledClassString in IQKeyboardManager.sharedManager().consideredToolbarPreviousNextViewClassesString() {
+        for disabledClassString in IQKeyboardManager.sharedManager().toolbarPreviousNextAllowedClasses {
             
             if let disabledClass = NSClassFromString(disabledClassString) {
                 
@@ -330,7 +330,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textFieldShouldBeginEditing(textField: UITextField) -> Bool {
         
-        if delegate?.respondsToSelector("textFieldShouldBeginEditing:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextFieldDelegate.textFieldShouldBeginEditing(_:))) != nil {
             return (delegate?.textFieldShouldBeginEditing?(textField) == true)
         } else {
             return true
@@ -339,7 +339,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textFieldShouldEndEditing(textField: UITextField) -> Bool {
         
-        if delegate?.respondsToSelector("textFieldShouldEndEditing:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextFieldDelegate.textFieldShouldEndEditing(_:))) != nil {
             return (delegate?.textFieldShouldEndEditing?(textField) == true)
         } else {
             return true
@@ -359,7 +359,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textField(textField: UITextField, shouldChangeCharactersInRange range: NSRange, replacementString string: String) -> Bool {
         
-        if delegate?.respondsToSelector("textField:shouldChangeCharactersInRange:replacementString:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextFieldDelegate.textField(_:shouldChangeCharactersInRange:replacementString:))) != nil {
             return (delegate?.textField?(textField, shouldChangeCharactersInRange: range, replacementString: string) == true)
         } else {
             return true
@@ -368,7 +368,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textFieldShouldClear(textField: UITextField) -> Bool {
         
-        if delegate?.respondsToSelector("textFieldShouldClear:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextFieldDelegate.textFieldShouldClear(_:))) != nil {
             return (delegate?.textFieldShouldClear?(textField) == true)
         } else {
             return true
@@ -380,7 +380,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
         
         var shouldReturn = true
         
-        if delegate?.respondsToSelector("textFieldShouldReturn:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextFieldDelegate.textFieldShouldReturn(_:))) != nil {
             shouldReturn = (delegate?.textFieldShouldReturn?(textField) == true)
         }
         
@@ -394,7 +394,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textViewShouldBeginEditing(textView: UITextView) -> Bool {
         
-        if delegate?.respondsToSelector("textViewShouldBeginEditing:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextViewDelegate.textViewShouldBeginEditing(_:))) != nil {
             return (delegate?.textViewShouldBeginEditing?(textView) == true)
         } else {
             return true
@@ -403,7 +403,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textViewShouldEndEditing(textView: UITextView) -> Bool {
         
-        if delegate?.respondsToSelector("textViewShouldEndEditing:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextViewDelegate.textViewShouldEndEditing(_:))) != nil {
             return (delegate?.textViewShouldEndEditing?(textView) == true)
         } else {
             return true
@@ -425,7 +425,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
         
         var shouldReturn = true
         
-        if delegate?.respondsToSelector("textView:shouldChangeCharactersInRange:replacementString:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextViewDelegate.textView(_:shouldChangeTextInRange:replacementText:))) != nil {
             shouldReturn = ((delegate?.textView?(textView, shouldChangeTextInRange: range, replacementText: text)) == true)
         }
         
@@ -449,7 +449,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
         
-        if delegate?.respondsToSelector("textView:shouldInteractWithURL:inRange:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextViewDelegate.textView(_:shouldInteractWithURL:inRange:))) != nil {
             return ((delegate?.textView?(textView, shouldInteractWithURL: URL, inRange: characterRange)) == true)
         } else {
             return true
@@ -459,7 +459,7 @@ public class IQKeyboardReturnKeyHandler: NSObject , UITextFieldDelegate, UITextV
     
     public func textView(textView: UITextView, shouldInteractWithTextAttachment textAttachment: NSTextAttachment, inRange characterRange: NSRange) -> Bool {
         
-        if delegate?.respondsToSelector("textView:shouldInteractWithTextAttachment:inRange:") != nil {
+        if delegate?.respondsToSelector(#selector(UITextViewDelegate.textView(_:shouldInteractWithTextAttachment:inRange:))) != nil {
             return ((delegate?.textView?(textView, shouldInteractWithTextAttachment: textAttachment, inRange: characterRange)) == true)
         } else {
             return true
diff --git a/IQKeyboardManagerSwift/IQTextView/IQTextView.swift b/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
index 3e837fc..3f52d1a 100755
--- a/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
+++ b/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
@@ -29,17 +29,17 @@ public class IQTextView : UITextView {
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.refreshPlaceholder), name: UITextViewTextDidChangeNotification, object: self)
     }
 
     override init(frame: CGRect, textContainer: NSTextContainer?) {
         super.init(frame: frame, textContainer: textContainer)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.refreshPlaceholder), name: UITextViewTextDidChangeNotification, object: self)
     }
     
     override public func awakeFromNib() {
          super.awakeFromNib()
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshPlaceholder", name: UITextViewTextDidChangeNotification, object: self)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.refreshPlaceholder), name: UITextViewTextDidChangeNotification, object: self)
     }
     
     deinit {
@@ -59,7 +59,7 @@ public class IQTextView : UITextView {
             
             if placeholderLabel == nil {
                 
-                placeholderLabel = UILabel(frame: CGRectInset(self.bounds, 5, 0))
+                placeholderLabel = UILabel()
                 
                 if let unwrappedPlaceholderLabel = placeholderLabel {
                     
@@ -79,6 +79,15 @@ public class IQTextView : UITextView {
         }
     }
     
+    public override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if let unwrappedPlaceholderLabel = placeholderLabel {
+            unwrappedPlaceholderLabel.sizeToFit()
+            unwrappedPlaceholderLabel.frame = CGRectMake(8, 8, CGRectGetWidth(self.frame)-16, CGRectGetHeight(unwrappedPlaceholderLabel.frame))
+        }
+    }
+
     public func refreshPlaceholder() {
         
         if text.characters.count != 0 {
diff --git a/IQKeyboardManagerSwift/IQToolbar/IQPreviousNextView.swift b/IQKeyboardManagerSwift/IQToolbar/IQPreviousNextView.swift
new file mode 100755
index 0000000..e7ac750
--- /dev/null
+++ b/IQKeyboardManagerSwift/IQToolbar/IQPreviousNextView.swift
@@ -0,0 +1,28 @@
+//
+// IQPreviousNextView.swift
+// https://github.com/hackiftekhar/IQKeyboardManager
+// Copyright (c) 2013-16 Iftekhar Qurashi.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import UIKit
+
+class IQPreviousNextView: UIView {
+
+}

From 1d4f0e9fe23d323b56b9e2ac30f922dacded3723 Mon Sep 17 00:00:00 2001
From: Juha Salo <juha.salo@solinor.com>
Date: Thu, 14 Apr 2016 11:04:34 +0300
Subject: [PATCH 03/11] Update project files and git attributes.

---
 .gitattributes                   |   1 -
 Clutch.xcodeproj/project.pbxproj | 318 +++++++++++++++++++------------
 2 files changed, 198 insertions(+), 121 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 8edfb9b..e69de29 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-*.pbxproj binary merge=union
diff --git a/Clutch.xcodeproj/project.pbxproj b/Clutch.xcodeproj/project.pbxproj
index bde2531..0c9d08b 100644
--- a/Clutch.xcodeproj/project.pbxproj
+++ b/Clutch.xcodeproj/project.pbxproj
@@ -31,6 +31,57 @@
 		044852971B3970A10034D0CA /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 03791CD11AD695C300FD80AC /* Media.xcassets */; };
 		0456BD5B1AEE5B5800218197 /* Crypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0456BD5A1AEE5B5800218197 /* Crypto.swift */; };
 		0456BD5E1AEFB34500218197 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0456BD5D1AEFB34500218197 /* Alamofire.framework */; };
+		0493699E1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
+		0493699F1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
+		049369A01CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
+		049369A11CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
+		049369A21CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
+		049369A31CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
+		049369A41CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
+		049369A51CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
+		049369A61CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
+		049369A71CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
+		049369A81CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
+		049369A91CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
+		049369AA1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
+		049369AB1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
+		049369AC1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
+		049369AD1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
+		049369AE1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
+		049369AF1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
+		049369B01CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
+		049369B11CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
+		049369B21CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
+		049369B31CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
+		049369B41CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
+		049369B51CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
+		049369B61CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
+		049369B71CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
+		049369B81CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
+		049369B91CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
+		049369BA1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
+		049369BB1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
+		049369BC1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
+		049369BD1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
+		049369BE1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
+		049369BF1CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
+		049369C01CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
+		049369C11CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
+		049369C21CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
+		049369C31CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
+		049369C41CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
+		049369C51CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
+		049369C61CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
+		049369C71CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
+		049369C81CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
+		049369C91CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
+		049369CA1CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
+		049369CB1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
+		049369CC1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
+		049369CD1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
+		049369CE1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
+		049369CF1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
+		049369D01CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
 		04B48B421B29BB3A00616048 /* NetworkingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04382FB41B10EDA200FF6A08 /* NetworkingSpec.swift */; };
 		04B48B4B1B3305AA00616048 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B4D1B3305AA00616048 /* Localizable.strings */; };
 		04B48B501B3305AB00616048 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B521B3305AB00616048 /* InfoPlist.strings */; };
@@ -39,45 +90,6 @@
 		04B48B5D1B33085200616048 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B4D1B3305AA00616048 /* Localizable.strings */; };
 		04E4840A1B131C3100119ABC /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */; };
 		04E4840B1B131C7500119ABC /* SwiftyJSON.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		04FD818C1B2074710089F784 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817B1B2074710089F784 /* IQNSArray+Sort.swift */; };
-		04FD818D1B2074710089F784 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817B1B2074710089F784 /* IQNSArray+Sort.swift */; };
-		04FD818E1B2074710089F784 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817B1B2074710089F784 /* IQNSArray+Sort.swift */; };
-		04FD818F1B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817C1B2074710089F784 /* IQUIView+Hierarchy.swift */; };
-		04FD81901B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817C1B2074710089F784 /* IQUIView+Hierarchy.swift */; };
-		04FD81911B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817C1B2074710089F784 /* IQUIView+Hierarchy.swift */; };
-		04FD81921B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817D1B2074710089F784 /* IQUIWindow+Hierarchy.swift */; };
-		04FD81931B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817D1B2074710089F784 /* IQUIWindow+Hierarchy.swift */; };
-		04FD81941B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817D1B2074710089F784 /* IQUIWindow+Hierarchy.swift */; };
-		04FD81951B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817F1B2074710089F784 /* IQKeyboardManagerConstants.swift */; };
-		04FD81961B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817F1B2074710089F784 /* IQKeyboardManagerConstants.swift */; };
-		04FD81971B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD817F1B2074710089F784 /* IQKeyboardManagerConstants.swift */; };
-		04FD81981B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81801B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift */; };
-		04FD81991B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81801B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift */; };
-		04FD819A1B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81801B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift */; };
-		04FD819B1B2074710089F784 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81811B2074710089F784 /* IQKeyboardManager.swift */; };
-		04FD819C1B2074710089F784 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81811B2074710089F784 /* IQKeyboardManager.swift */; };
-		04FD819E1B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81821B2074710089F784 /* IQKeyboardReturnKeyHandler.swift */; };
-		04FD819F1B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81821B2074710089F784 /* IQKeyboardReturnKeyHandler.swift */; };
-		04FD81A01B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81821B2074710089F784 /* IQKeyboardReturnKeyHandler.swift */; };
-		04FD81A11B2074710089F784 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81841B2074710089F784 /* IQTextView.swift */; };
-		04FD81A21B2074710089F784 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81841B2074710089F784 /* IQTextView.swift */; };
-		04FD81A31B2074710089F784 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81841B2074710089F784 /* IQTextView.swift */; };
-		04FD81A41B2074710089F784 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81861B2074710089F784 /* IQBarButtonItem.swift */; };
-		04FD81A51B2074710089F784 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81861B2074710089F784 /* IQBarButtonItem.swift */; };
-		04FD81A61B2074710089F784 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81861B2074710089F784 /* IQBarButtonItem.swift */; };
-		04FD81A71B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81871B2074710089F784 /* IQTitleBarButtonItem.swift */; };
-		04FD81A81B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81871B2074710089F784 /* IQTitleBarButtonItem.swift */; };
-		04FD81A91B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81871B2074710089F784 /* IQTitleBarButtonItem.swift */; };
-		04FD81AA1B2074710089F784 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81881B2074710089F784 /* IQToolbar.swift */; };
-		04FD81AB1B2074710089F784 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81881B2074710089F784 /* IQToolbar.swift */; };
-		04FD81AC1B2074710089F784 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81881B2074710089F784 /* IQToolbar.swift */; };
-		04FD81AD1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81891B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift */; };
-		04FD81AE1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81891B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift */; };
-		04FD81AF1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81891B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift */; };
-		04FD81B01B2074710089F784 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FD818B1B2074710089F784 /* IQKeyboardManager.bundle */; };
-		04FD81B11B2074710089F784 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FD818B1B2074710089F784 /* IQKeyboardManager.bundle */; };
-		04FD81B21B2074710089F784 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FD818B1B2074710089F784 /* IQKeyboardManager.bundle */; };
-		04FD81B61B20780B0089F784 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD81811B2074710089F784 /* IQKeyboardManager.swift */; };
 		6FFD1FEB1AD6C02D001DF798 /* SPHAddCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FFD1FEA1AD6C02D001DF798 /* SPHAddCardViewController.swift */; };
 		945B16F81B467EFD00158A40 /* Clutch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03788D451AC978DD007FC30F /* Clutch.framework */; };
 		945B16F91B467EFD00158A40 /* Clutch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03788D451AC978DD007FC30F /* Clutch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -127,6 +139,27 @@
 			remoteGlobalIDString = F8111E0519A951050040E7D1;
 			remoteInfo = "iOS Example";
 		};
+		046E7EE61CA43D5300DEE76A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0448524F1B396FC90034D0CA /* Alamofire.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4CF626EF1BA7CB3E0011A099;
+			remoteInfo = "Alamofire tvOS";
+		};
+		046E7EE81CA43D5300DEE76A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0448524F1B396FC90034D0CA /* Alamofire.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4CF626F81BA7CB3E0011A099;
+			remoteInfo = "Alamofire tvOS Tests";
+		};
+		046E7EEA1CA43D5300DEE76A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0448524F1B396FC90034D0CA /* Alamofire.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E4202FE01B667AA100C997FB;
+			remoteInfo = "Alamofire watchOS";
+		};
 		04E484081B131C1300119ABC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 03788D3C1AC978DD007FC30F /* Project object */;
@@ -249,6 +282,23 @@
 		0456BD5A1AEE5B5800218197 /* Crypto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
 		0456BD5D1AEFB34500218197 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
 		0456BD5F1AEFB3A100218197 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
+		049369891CB411AA0012C895 /* IQNSArray+Sort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQNSArray+Sort.swift"; sourceTree = "<group>"; };
+		0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIScrollView+Additions.swift"; sourceTree = "<group>"; };
+		0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUITextFieldView+Additions.swift"; sourceTree = "<group>"; };
+		0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+Hierarchy.swift"; sourceTree = "<group>"; };
+		0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIViewController+Additions.swift"; sourceTree = "<group>"; };
+		0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIWindow+Hierarchy.swift"; sourceTree = "<group>"; };
+		049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstants.swift; sourceTree = "<group>"; };
+		049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstantsInternal.swift; sourceTree = "<group>"; };
+		049369921CB411AA0012C895 /* IQKeyboardManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManager.swift; sourceTree = "<group>"; };
+		049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardReturnKeyHandler.swift; sourceTree = "<group>"; };
+		049369951CB411AA0012C895 /* IQTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTextView.swift; sourceTree = "<group>"; };
+		049369971CB411AA0012C895 /* IQBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQBarButtonItem.swift; sourceTree = "<group>"; };
+		049369981CB411AA0012C895 /* IQPreviousNextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQPreviousNextView.swift; sourceTree = "<group>"; };
+		049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTitleBarButtonItem.swift; sourceTree = "<group>"; };
+		0493699A1CB411AA0012C895 /* IQToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQToolbar.swift; sourceTree = "<group>"; };
+		0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+IQKeyboardToolbar.swift"; sourceTree = "<group>"; };
+		0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = IQKeyboardManager.bundle; sourceTree = "<group>"; };
 		04B48B471B32F5EB00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Main.strings"; sourceTree = "<group>"; };
 		04B48B481B32F5EB00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		04B48B4C1B3305AA00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -263,19 +313,6 @@
 		04B48B651B3309A100616048 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
 		04B48B661B3309A200616048 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/iOS/SwiftyJSON.framework; sourceTree = "<group>"; };
-		04FD817B1B2074710089F784 /* IQNSArray+Sort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQNSArray+Sort.swift"; sourceTree = "<group>"; };
-		04FD817C1B2074710089F784 /* IQUIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+Hierarchy.swift"; sourceTree = "<group>"; };
-		04FD817D1B2074710089F784 /* IQUIWindow+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIWindow+Hierarchy.swift"; sourceTree = "<group>"; };
-		04FD817F1B2074710089F784 /* IQKeyboardManagerConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstants.swift; sourceTree = "<group>"; };
-		04FD81801B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstantsInternal.swift; sourceTree = "<group>"; };
-		04FD81811B2074710089F784 /* IQKeyboardManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManager.swift; sourceTree = "<group>"; };
-		04FD81821B2074710089F784 /* IQKeyboardReturnKeyHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardReturnKeyHandler.swift; sourceTree = "<group>"; };
-		04FD81841B2074710089F784 /* IQTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTextView.swift; sourceTree = "<group>"; };
-		04FD81861B2074710089F784 /* IQBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQBarButtonItem.swift; sourceTree = "<group>"; };
-		04FD81871B2074710089F784 /* IQTitleBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTitleBarButtonItem.swift; sourceTree = "<group>"; };
-		04FD81881B2074710089F784 /* IQToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQToolbar.swift; sourceTree = "<group>"; };
-		04FD81891B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+IQKeyboardToolbar.swift"; sourceTree = "<group>"; };
-		04FD818B1B2074710089F784 /* IQKeyboardManager.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = IQKeyboardManager.bundle; sourceTree = "<group>"; };
 		6FFD1FEA1AD6C02D001DF798 /* SPHAddCardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SPHAddCardViewController.swift; sourceTree = "<group>"; };
 		94C095521B464F5A0017D024 /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = Carthage/Build/iOS/CryptoSwift.framework; sourceTree = "<group>"; };
 		94C095531B464F5A0017D024 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
@@ -411,6 +448,7 @@
 		03788D761ACAA53E007FC30F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				049369871CB411AA0012C895 /* IQKeyboardManagerSwift */,
 				0448524A1B396FC90034D0CA /* Alamofire */,
 				04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */,
 				0405D65B1B0A15B70050CA82 /* CryptoSwift.framework */,
@@ -473,7 +511,6 @@
 		03C92A711ACC2DB000422831 /* Library */ = {
 			isa = PBXGroup;
 			children = (
-				04FD81791B2074710089F784 /* IQKeybordManagerSwift */,
 				03788D471AC978DD007FC30F /* Clutch */,
 				03788D541AC978DD007FC30F /* ClutchTests */,
 			);
@@ -507,9 +544,12 @@
 			isa = PBXGroup;
 			children = (
 				0448528B1B396FC90034D0CA /* Alamofire.framework */,
-				0448528D1B396FC90034D0CA /* Alamofire.framework */,
 				0448528F1B396FC90034D0CA /* Alamofire iOS Tests.xctest */,
+				0448528D1B396FC90034D0CA /* Alamofire.framework */,
 				044852911B396FC90034D0CA /* Alamofire OSX Tests.xctest */,
+				046E7EE71CA43D5300DEE76A /* Alamofire.framework */,
+				046E7EE91CA43D5300DEE76A /* Alamofire tvOS Tests.xctest */,
+				046E7EEB1CA43D5300DEE76A /* Alamofire.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -609,63 +649,66 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		04FD81791B2074710089F784 /* IQKeybordManagerSwift */ = {
+		049369871CB411AA0012C895 /* IQKeyboardManagerSwift */ = {
 			isa = PBXGroup;
 			children = (
-				04FD817A1B2074710089F784 /* Categories */,
-				04FD817E1B2074710089F784 /* Constants */,
-				04FD81811B2074710089F784 /* IQKeyboardManager.swift */,
-				04FD81821B2074710089F784 /* IQKeyboardReturnKeyHandler.swift */,
-				04FD81831B2074710089F784 /* IQTextView */,
-				04FD81851B2074710089F784 /* IQToolbar */,
-				04FD818A1B2074710089F784 /* Resources */,
-			);
-			name = IQKeybordManagerSwift;
-			path = Clutch/IQKeybordManagerSwift;
+				049369881CB411AA0012C895 /* Categories */,
+				0493698F1CB411AA0012C895 /* Constants */,
+				049369921CB411AA0012C895 /* IQKeyboardManager.swift */,
+				049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */,
+				049369941CB411AA0012C895 /* IQTextView */,
+				049369961CB411AA0012C895 /* IQToolbar */,
+				0493699C1CB411AA0012C895 /* Resources */,
+			);
+			path = IQKeyboardManagerSwift;
 			sourceTree = "<group>";
 		};
-		04FD817A1B2074710089F784 /* Categories */ = {
+		049369881CB411AA0012C895 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				04FD817B1B2074710089F784 /* IQNSArray+Sort.swift */,
-				04FD817C1B2074710089F784 /* IQUIView+Hierarchy.swift */,
-				04FD817D1B2074710089F784 /* IQUIWindow+Hierarchy.swift */,
+				049369891CB411AA0012C895 /* IQNSArray+Sort.swift */,
+				0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */,
+				0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */,
+				0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */,
+				0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */,
+				0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
 		};
-		04FD817E1B2074710089F784 /* Constants */ = {
+		0493698F1CB411AA0012C895 /* Constants */ = {
 			isa = PBXGroup;
 			children = (
-				04FD817F1B2074710089F784 /* IQKeyboardManagerConstants.swift */,
-				04FD81801B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift */,
+				049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */,
+				049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */,
 			);
 			path = Constants;
 			sourceTree = "<group>";
 		};
-		04FD81831B2074710089F784 /* IQTextView */ = {
+		049369941CB411AA0012C895 /* IQTextView */ = {
 			isa = PBXGroup;
 			children = (
-				04FD81841B2074710089F784 /* IQTextView.swift */,
+				049369951CB411AA0012C895 /* IQTextView.swift */,
 			);
 			path = IQTextView;
 			sourceTree = "<group>";
 		};
-		04FD81851B2074710089F784 /* IQToolbar */ = {
+		049369961CB411AA0012C895 /* IQToolbar */ = {
 			isa = PBXGroup;
 			children = (
-				04FD81861B2074710089F784 /* IQBarButtonItem.swift */,
-				04FD81871B2074710089F784 /* IQTitleBarButtonItem.swift */,
-				04FD81881B2074710089F784 /* IQToolbar.swift */,
-				04FD81891B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift */,
+				049369971CB411AA0012C895 /* IQBarButtonItem.swift */,
+				049369981CB411AA0012C895 /* IQPreviousNextView.swift */,
+				049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */,
+				0493699A1CB411AA0012C895 /* IQToolbar.swift */,
+				0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */,
 			);
 			path = IQToolbar;
 			sourceTree = "<group>";
 		};
-		04FD818A1B2074710089F784 /* Resources */ = {
+		0493699C1CB411AA0012C895 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				04FD818B1B2074710089F784 /* IQKeyboardManager.bundle */,
+				0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -756,6 +799,8 @@
 		03788D3C1AC978DD007FC30F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0730;
+				LastSwiftUpdateCheck = 0730;
 				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = "Solinor Oy";
 				TargetAttributes = {
@@ -836,6 +881,27 @@
 			remoteRef = 044852931B396FC90034D0CA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		046E7EE71CA43D5300DEE76A /* Alamofire.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Alamofire.framework;
+			remoteRef = 046E7EE61CA43D5300DEE76A /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		046E7EE91CA43D5300DEE76A /* Alamofire tvOS Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "Alamofire tvOS Tests.xctest";
+			remoteRef = 046E7EE81CA43D5300DEE76A /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		046E7EEB1CA43D5300DEE76A /* Alamofire.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Alamofire.framework;
+			remoteRef = 046E7EEA1CA43D5300DEE76A /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -843,10 +909,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				049369CE1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
 				044852971B3970A10034D0CA /* Media.xcassets in Resources */,
 				04B48B4B1B3305AA00616048 /* Localizable.strings in Resources */,
 				03791CD41AD6960300FD80AC /* SPHClutch.storyboard in Resources */,
-				04FD81B01B2074710089F784 /* IQKeyboardManager.bundle in Resources */,
 				04B48B551B3305AB00616048 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -855,7 +921,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				04FD81B11B2074710089F784 /* IQKeyboardManager.bundle in Resources */,
+				049369CF1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
 				04B48B501B3305AB00616048 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -865,8 +931,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				04B48B5A1B3305AB00616048 /* InfoPlist.strings in Resources */,
-				04FD81B21B2074710089F784 /* IQKeyboardManager.bundle in Resources */,
 				03C92A431ACC26B700422831 /* Main.storyboard in Resources */,
+				049369D01CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
 				04B48B5D1B33085200616048 /* Localizable.strings in Resources */,
 				03C92A481ACC26B700422831 /* LaunchScreen.xib in Resources */,
 				03C92A451ACC26B700422831 /* Images.xcassets in Resources */,
@@ -915,24 +981,28 @@
 			files = (
 				03788D6D1AC988D5007FC30F /* Extensions.swift in Sources */,
 				6FFD1FEB1AD6C02D001DF798 /* SPHAddCardViewController.swift in Sources */,
-				04FD81AA1B2074710089F784 /* IQToolbar.swift in Sources */,
+				049369C21CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
+				049369C51CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
 				03C92A341ACC235400422831 /* SPHClutchFormatter.swift in Sources */,
-				04FD81A41B2074710089F784 /* IQBarButtonItem.swift in Sources */,
+				049369B31CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
+				049369CB1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
+				049369A11CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
+				049369A71CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
+				049369C81CB411AA0012C895 /* IQToolbar.swift in Sources */,
 				04382FB31B0F616000FF6A08 /* Networking.swift in Sources */,
-				04FD81951B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */,
-				04FD81A11B2074710089F784 /* IQTextView.swift in Sources */,
+				049369AA1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
+				049369B91CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
+				049369A41CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
 				0456BD5B1AEE5B5800218197 /* Crypto.swift in Sources */,
-				04FD819B1B2074710089F784 /* IQKeyboardManager.swift in Sources */,
-				04FD81A71B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */,
-				04FD81921B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */,
 				03C92A641ACC29E900422831 /* SPHClutchFormLabel.swift in Sources */,
+				049369B61CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
 				03C92A321ACC226C00422831 /* SPHClutchTextField.swift in Sources */,
+				049369BF1CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
 				03788D641AC9793D007FC30F /* SPHClutch.swift in Sources */,
-				04FD819E1B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */,
-				04FD818F1B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */,
-				04FD81981B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
-				04FD81AD1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				04FD818C1B2074710089F784 /* IQNSArray+Sort.swift in Sources */,
+				0493699E1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
+				049369B01CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
+				049369BC1CB411AA0012C895 /* IQTextView.swift in Sources */,
+				049369AD1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -940,20 +1010,24 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				04FD81AE1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				04FD819C1B2074710089F784 /* IQKeyboardManager.swift in Sources */,
-				04FD81931B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */,
-				04FD81A51B2074710089F784 /* IQBarButtonItem.swift in Sources */,
-				04FD81991B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
-				04FD81901B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */,
-				04FD81A21B2074710089F784 /* IQTextView.swift in Sources */,
+				049369CC1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
+				049369A51CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
+				049369C61CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
+				049369B11CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
+				049369C01CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
+				049369BA1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
 				03788D861ACABEC5007FC30F /* SPHClutchSpec.swift in Sources */,
+				049369A21CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
+				049369AB1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
+				049369B41CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
 				04B48B421B29BB3A00616048 /* NetworkingSpec.swift in Sources */,
-				04FD81961B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */,
-				04FD81A81B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */,
-				04FD818D1B2074710089F784 /* IQNSArray+Sort.swift in Sources */,
-				04FD81AB1B2074710089F784 /* IQToolbar.swift in Sources */,
-				04FD819F1B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */,
+				049369C91CB411AA0012C895 /* IQToolbar.swift in Sources */,
+				049369B71CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
+				049369A81CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
+				049369C31CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
+				049369BD1CB411AA0012C895 /* IQTextView.swift in Sources */,
+				0493699F1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
+				049369AE1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -961,20 +1035,24 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				04FD81AF1B2074710089F784 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				04FD81941B2074710089F784 /* IQUIWindow+Hierarchy.swift in Sources */,
-				04FD81A61B2074710089F784 /* IQBarButtonItem.swift in Sources */,
-				04FD819A1B2074710089F784 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
-				04FD81911B2074710089F784 /* IQUIView+Hierarchy.swift in Sources */,
+				049369CD1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
+				049369A61CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
+				049369C71CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
+				049369B21CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
+				049369C11CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
+				049369BB1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
 				03C92A401ACC26B700422831 /* ViewController.swift in Sources */,
-				04FD81A31B2074710089F784 /* IQTextView.swift in Sources */,
+				049369A31CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
+				049369AC1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
+				049369B51CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
 				03C92A3E1ACC26B700422831 /* AppDelegate.swift in Sources */,
-				04FD81971B2074710089F784 /* IQKeyboardManagerConstants.swift in Sources */,
-				04FD81A91B2074710089F784 /* IQTitleBarButtonItem.swift in Sources */,
-				04FD818E1B2074710089F784 /* IQNSArray+Sort.swift in Sources */,
-				04FD81AC1B2074710089F784 /* IQToolbar.swift in Sources */,
-				04FD81B61B20780B0089F784 /* IQKeyboardManager.swift in Sources */,
-				04FD81A01B2074710089F784 /* IQKeyboardReturnKeyHandler.swift in Sources */,
+				049369CA1CB411AA0012C895 /* IQToolbar.swift in Sources */,
+				049369B81CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
+				049369A91CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
+				049369C41CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
+				049369BE1CB411AA0012C895 /* IQTextView.swift in Sources */,
+				049369A01CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
+				049369AF1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From 31c1f48f3d6923c1719947719cb9d31701102c7c Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Thu, 14 Apr 2016 21:42:22 +0300
Subject: [PATCH 04/11] Update libraries

---
 Cartfile.resolved | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cartfile.resolved b/Cartfile.resolved
index 42b54cf..e4c0c08 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Alamofire/Alamofire" "3.3.0"
+github "Alamofire/Alamofire" "3.3.1"
 github "krzyzanowskim/CryptoSwift" "0.3.1"
 github "Quick/Nimble" "v3.2.0"
-github "Quick/Quick" "v0.9.1"
+github "Quick/Quick" "v0.9.2"
 github "SwiftyJSON/SwiftyJSON" "2.3.3"

From 53586827a27c1a0555927815f0e2eaf00db81aaf Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Thu, 14 Apr 2016 21:43:41 +0300
Subject: [PATCH 05/11] Fix Cipher error, commented code needs review

---
 Clutch/Crypto.swift | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index fc80919..2280b55 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -57,27 +57,28 @@ private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
     return encryptedData
 }
 
-public func encryptWithRsaAes(data: String, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
+public func encryptWithRsaAes(data: String?, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
 {
-    let keyAes = Cipher.randomIV(AES.blockSize)
-    let iv = Cipher.randomIV(AES.blockSize)
+    let cipher = (dispatch_queue_create("", DISPATCH_QUEUE_SERIAL) as! Cipher).dynamicType
+    let keyAes = cipher.randomIV(AES.blockSize)
+    let iv = cipher.randomIV(AES.blockSize)
     
-    if let encryptedData = CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC)?.encrypt([UInt8](data.utf8), padding: PKCS7())
+    /*if let encryptedData = try CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data!.utf8), padding: PKCS7())
     {
-        if let publicKey = loadDER(NSData(base64EncodedString: certificateBase64Der, options: .allZeros)!)
+        if let publicKey = loadDER(NSData(base64EncodedString: certificateBase64Der, options: [])!)
         {
-            if let encryptedKey = encryptWithData(NSData(bytes: keyAes, length: keyAes.count), publicKey)
+            if let encryptedKey = encryptWithData(NSData(bytes: keyAes, length: keyAes.count), publicKey: publicKey)
             {
                 let encryptedBase64Message =  NSData(bytes: encryptedData, length: encryptedData.count).base64EncodedStringWithOptions(.allZeros)
                 
-                let encryptedBase64Key = encryptedKey.base64EncodedStringWithOptions(.allZeros)
+                let encryptedBase64Key = encryptedKey.base64EncodedStringWithOptions([])
                 
-                let base64Iv = NSData(bytes: iv, length: iv.count).base64EncodedStringWithOptions(.allZeros)
+                let base64Iv = NSData(bytes: iv, length: iv.count).base64EncodedStringWithOptions([])
                 
                 return (encryptedBase64Message, encryptedBase64Key, base64Iv)
             }
         }
-    }
+    }*/
     return nil
 }
 

From 6fd0fce2493de5828e9cf48ea3a49dbd3a291a06 Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Thu, 14 Apr 2016 21:45:28 +0300
Subject: [PATCH 06/11] Fix errors generated by Alamofire version  update

---
 Clutch/Networking.swift | 48 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Clutch/Networking.swift b/Clutch/Networking.swift
index 9a750a4..0415e96 100644
--- a/Clutch/Networking.swift
+++ b/Clutch/Networking.swift
@@ -65,16 +65,16 @@ public class Networking {
     }
     
     public func helperGetTransactionId(host: String, success: (String) -> (), failure: (NSError) -> ()) -> () {
-        var reqId = getRequestId() // requestId not validated for this call
+        _ = getRequestId() // requestId not validated for this call
 
-            manager.request(.GET, "\(host)/mobile-key").responseJSON{request, response, data, error in
-            if let errorMessage = error {
-                println("Networking.helperGetTransactionId most likely received malformed data from server.")
+            manager.request(.GET, "\(host)/mobile-key").responseJSON{ response in
+            if let errorMessage = response.result.error {
+                print("Networking.helperGetTransactionId most likely received malformed data from server.")
                 failure(errorMessage)
-            } else if let json: AnyObject = data {
+            } else if let json: AnyObject = response.data{
                 let transactionId = JSON(json)["id"].stringValue
                 
-                if count(transactionId) > 0
+                if transactionId.characters.count > 0
                 {
                     success(transactionId)
                 } else {
@@ -88,14 +88,14 @@ public class Networking {
     }
     
     public func getKey(transactionId: String, success: (String) -> (), failure: (NSError) -> ()) -> () {
-        var reqId = getRequestId()
-        manager.request(.GET, "\(self.mobileApiAddress!)/mobile/\(transactionId)/key", headers: getSphHeaders(reqId)).responseJSON{(request, response, data, error) in
-            if let errorMessage = error {
-                println("Networking.getKey most likely received malformed data from server.")
+        let reqId = getRequestId()
+        manager.request(.GET, "\(self.mobileApiAddress!)/mobile/\(transactionId)/key", headers: getSphHeaders(reqId)).responseJSON{(response) in
+            if let errorMessage = response.result.error {
+                print("Networking.getKey most likely received malformed data from server.")
                 failure(errorMessage)
-            } else if let json: AnyObject = data {
+            } else if let json: AnyObject = response.data {
                 let key = JSON(json)["key"].stringValue
-                if count(key) > 0 && self.doesContainValidRequestId(response, requestId: reqId)
+                if key.characters.count > 0 && self.doesContainValidRequestId(response.response, requestId: reqId)
                 {
                     success(key)
                 } else {
@@ -121,17 +121,17 @@ public class Networking {
                 return (mutableURLRequest, nil)
             }
             
-            var reqId = getRequestId()
-            manager.request(.POST, "\(self.mobileApiAddress!)/mobile/\(transactionId)/tokenize", parameters: payloadJson as? [String : AnyObject], encoding: .Custom(custom), headers: getSphHeaders(reqId)).responseJSON{(request, response, data, error) in
+            let reqId = getRequestId()
+            manager.request(.POST, "\(self.mobileApiAddress!)/mobile/\(transactionId)/tokenize", parameters: payloadJson as? [String : AnyObject], encoding: .Custom(custom), headers: getSphHeaders(reqId)).responseJSON{(response) in
 
-                if let errorMessage = error {
-                    println("Networking.tokenize most likely received malformed data from server.")
+                if let errorMessage = response.result.error {
+                    print("Networking.tokenize most likely received malformed data from server.")
                     failure(errorMessage)
-                } else if let json: AnyObject = data {
+                } else if let json: AnyObject = response.data {
                     let code = JSON(json)["result"]["code"].int
                     let message = JSON(json)["result"]["message"].stringValue
                     
-                    if code == 100 && message == "OK" && self.doesContainValidRequestId(response, requestId: reqId)
+                    if code == 100 && message == "OK" && self.doesContainValidRequestId(response.response, requestId: reqId)
                     {
                         success(self.resultStringTokenisationSuccess)
                     }
@@ -149,13 +149,13 @@ public class Networking {
     }
     
     public func helperGetToken(host: String, transactionId: String, success: (String) -> (), failure: (NSError) -> ()) -> () {
-        var reqId = getRequestId() // request id not validated for this call
-        manager.request(.GET, "\(host)/tokenization/\(transactionId)", headers: getSphHeaders(reqId)).responseJSON{(request, response, data, error) in
-            if let errorMessage = error {
-                println("Networking.helperGetToken most likely received malformed data from server.")
+        let reqId = getRequestId() // request id not validated for this call
+        manager.request(.GET, "\(host)/tokenization/\(transactionId)", headers: getSphHeaders(reqId)).responseJSON{(response) in
+            if let errorMessage = response.result.error {
+                print("Networking.helperGetToken most likely received malformed data from server.")
                 failure(errorMessage)
-            } else if let dataMessage: AnyObject = data {
-                if count(JSON(dataMessage)["token"].stringValue) > 0
+            } else if let dataMessage: AnyObject = response.data {
+                if JSON(dataMessage)["token"].stringValue.characters.count > 0
                 {
                     success(JSON(dataMessage).description)
                 } else {

From dc0b3de7a295391d698497cf4deacf786946452a Mon Sep 17 00:00:00 2001
From: Juha Salo <juha.salo@solinor.com>
Date: Thu, 14 Apr 2016 22:58:30 +0300
Subject: [PATCH 07/11] Updated IQKeyboardManager, updated IPs, fixed Alamofire
 errors and temporarily allow http (without s) requests for all

---
 Clutch.xcodeproj/project.pbxproj              | 228 ++++++------------
 Clutch/IQKeybordManagerSwift/.DS_Store        | Bin 6148 -> 0 bytes
 .../Categories/IQUIScrollView+Additions.swift |  47 ----
 .../IQUITextFieldView+Additions.swift         |  56 -----
 .../IQUIViewController+Additions.swift        |  46 ----
 Clutch/Networking.swift                       |   6 +-
 ClutchDemo/AppDelegate.swift                  |   2 +-
 ClutchDemo/Info.plist                         |   4 +
 ClutchDemo/ViewController.swift               |   2 +-
 9 files changed, 89 insertions(+), 302 deletions(-)
 delete mode 100644 Clutch/IQKeybordManagerSwift/.DS_Store
 delete mode 100755 Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
 delete mode 100755 Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
 delete mode 100755 Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift

diff --git a/Clutch.xcodeproj/project.pbxproj b/Clutch.xcodeproj/project.pbxproj
index 0c9d08b..d514143 100644
--- a/Clutch.xcodeproj/project.pbxproj
+++ b/Clutch.xcodeproj/project.pbxproj
@@ -31,63 +31,29 @@
 		044852971B3970A10034D0CA /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 03791CD11AD695C300FD80AC /* Media.xcassets */; };
 		0456BD5B1AEE5B5800218197 /* Crypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0456BD5A1AEE5B5800218197 /* Crypto.swift */; };
 		0456BD5E1AEFB34500218197 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0456BD5D1AEFB34500218197 /* Alamofire.framework */; };
-		0493699E1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
-		0493699F1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
-		049369A01CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369891CB411AA0012C895 /* IQNSArray+Sort.swift */; };
-		049369A11CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
-		049369A21CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
-		049369A31CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */; };
-		049369A41CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
-		049369A51CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
-		049369A61CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */; };
-		049369A71CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
-		049369A81CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
-		049369A91CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */; };
-		049369AA1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
-		049369AB1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
-		049369AC1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */; };
-		049369AD1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
-		049369AE1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
-		049369AF1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */; };
-		049369B01CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
-		049369B11CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
-		049369B21CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */; };
-		049369B31CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
-		049369B41CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
-		049369B51CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */; };
-		049369B61CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
-		049369B71CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
-		049369B81CB411AA0012C895 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369921CB411AA0012C895 /* IQKeyboardManager.swift */; };
-		049369B91CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
-		049369BA1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
-		049369BB1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */; };
-		049369BC1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
-		049369BD1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
-		049369BE1CB411AA0012C895 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369951CB411AA0012C895 /* IQTextView.swift */; };
-		049369BF1CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
-		049369C01CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
-		049369C11CB411AA0012C895 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369971CB411AA0012C895 /* IQBarButtonItem.swift */; };
-		049369C21CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
-		049369C31CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
-		049369C41CB411AA0012C895 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369981CB411AA0012C895 /* IQPreviousNextView.swift */; };
-		049369C51CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
-		049369C61CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
-		049369C71CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */; };
-		049369C81CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
-		049369C91CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
-		049369CA1CB411AA0012C895 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699A1CB411AA0012C895 /* IQToolbar.swift */; };
-		049369CB1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
-		049369CC1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
-		049369CD1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */; };
-		049369CE1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
-		049369CF1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
-		049369D01CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */; };
 		04B48B421B29BB3A00616048 /* NetworkingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04382FB41B10EDA200FF6A08 /* NetworkingSpec.swift */; };
 		04B48B4B1B3305AA00616048 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B4D1B3305AA00616048 /* Localizable.strings */; };
 		04B48B501B3305AB00616048 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B521B3305AB00616048 /* InfoPlist.strings */; };
 		04B48B551B3305AB00616048 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B571B3305AB00616048 /* InfoPlist.strings */; };
 		04B48B5A1B3305AB00616048 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B5C1B3305AB00616048 /* InfoPlist.strings */; };
 		04B48B5D1B33085200616048 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04B48B4D1B3305AA00616048 /* Localizable.strings */; };
+		04D42E111CC0250C00880D70 /* IQNSArray+Sort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42DFC1CC0250C00880D70 /* IQNSArray+Sort.swift */; };
+		04D42E121CC0250C00880D70 /* IQUIScrollView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42DFD1CC0250C00880D70 /* IQUIScrollView+Additions.swift */; };
+		04D42E131CC0250C00880D70 /* IQUITextFieldView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42DFE1CC0250C00880D70 /* IQUITextFieldView+Additions.swift */; };
+		04D42E141CC0250C00880D70 /* IQUIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42DFF1CC0250C00880D70 /* IQUIView+Hierarchy.swift */; };
+		04D42E151CC0250C00880D70 /* IQUIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E001CC0250C00880D70 /* IQUIViewController+Additions.swift */; };
+		04D42E161CC0250C00880D70 /* IQUIWindow+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E011CC0250C00880D70 /* IQUIWindow+Hierarchy.swift */; };
+		04D42E171CC0250C00880D70 /* IQKeyboardManagerConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E031CC0250C00880D70 /* IQKeyboardManagerConstants.swift */; };
+		04D42E181CC0250C00880D70 /* IQKeyboardManagerConstantsInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E041CC0250C00880D70 /* IQKeyboardManagerConstantsInternal.swift */; };
+		04D42E191CC0250C00880D70 /* IQKeyboardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E051CC0250C00880D70 /* IQKeyboardManager.swift */; };
+		04D42E1A1CC0250C00880D70 /* IQKeyboardReturnKeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E061CC0250C00880D70 /* IQKeyboardReturnKeyHandler.swift */; };
+		04D42E1B1CC0250C00880D70 /* IQTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E081CC0250C00880D70 /* IQTextView.swift */; };
+		04D42E1C1CC0250C00880D70 /* IQBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E0A1CC0250C00880D70 /* IQBarButtonItem.swift */; };
+		04D42E1D1CC0250C00880D70 /* IQPreviousNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E0B1CC0250C00880D70 /* IQPreviousNextView.swift */; };
+		04D42E1E1CC0250C00880D70 /* IQTitleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E0C1CC0250C00880D70 /* IQTitleBarButtonItem.swift */; };
+		04D42E1F1CC0250C00880D70 /* IQToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E0D1CC0250C00880D70 /* IQToolbar.swift */; };
+		04D42E201CC0250C00880D70 /* IQUIView+IQKeyboardToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D42E0E1CC0250C00880D70 /* IQUIView+IQKeyboardToolbar.swift */; };
+		04D42E211CC0250C00880D70 /* IQKeyboardManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04D42E101CC0250C00880D70 /* IQKeyboardManager.bundle */; };
 		04E4840A1B131C3100119ABC /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */; };
 		04E4840B1B131C7500119ABC /* SwiftyJSON.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6FFD1FEB1AD6C02D001DF798 /* SPHAddCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FFD1FEA1AD6C02D001DF798 /* SPHAddCardViewController.swift */; };
@@ -282,23 +248,6 @@
 		0456BD5A1AEE5B5800218197 /* Crypto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
 		0456BD5D1AEFB34500218197 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
 		0456BD5F1AEFB3A100218197 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
-		049369891CB411AA0012C895 /* IQNSArray+Sort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQNSArray+Sort.swift"; sourceTree = "<group>"; };
-		0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIScrollView+Additions.swift"; sourceTree = "<group>"; };
-		0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUITextFieldView+Additions.swift"; sourceTree = "<group>"; };
-		0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+Hierarchy.swift"; sourceTree = "<group>"; };
-		0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIViewController+Additions.swift"; sourceTree = "<group>"; };
-		0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIWindow+Hierarchy.swift"; sourceTree = "<group>"; };
-		049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstants.swift; sourceTree = "<group>"; };
-		049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstantsInternal.swift; sourceTree = "<group>"; };
-		049369921CB411AA0012C895 /* IQKeyboardManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManager.swift; sourceTree = "<group>"; };
-		049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardReturnKeyHandler.swift; sourceTree = "<group>"; };
-		049369951CB411AA0012C895 /* IQTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTextView.swift; sourceTree = "<group>"; };
-		049369971CB411AA0012C895 /* IQBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQBarButtonItem.swift; sourceTree = "<group>"; };
-		049369981CB411AA0012C895 /* IQPreviousNextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQPreviousNextView.swift; sourceTree = "<group>"; };
-		049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTitleBarButtonItem.swift; sourceTree = "<group>"; };
-		0493699A1CB411AA0012C895 /* IQToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQToolbar.swift; sourceTree = "<group>"; };
-		0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+IQKeyboardToolbar.swift"; sourceTree = "<group>"; };
-		0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = IQKeyboardManager.bundle; sourceTree = "<group>"; };
 		04B48B471B32F5EB00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Main.strings"; sourceTree = "<group>"; };
 		04B48B481B32F5EB00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		04B48B4C1B3305AA00616048 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -312,6 +261,23 @@
 		04B48B631B33096E00616048 /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		04B48B651B3309A100616048 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
 		04B48B661B3309A200616048 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		04D42DFC1CC0250C00880D70 /* IQNSArray+Sort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQNSArray+Sort.swift"; sourceTree = "<group>"; };
+		04D42DFD1CC0250C00880D70 /* IQUIScrollView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIScrollView+Additions.swift"; sourceTree = "<group>"; };
+		04D42DFE1CC0250C00880D70 /* IQUITextFieldView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUITextFieldView+Additions.swift"; sourceTree = "<group>"; };
+		04D42DFF1CC0250C00880D70 /* IQUIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+Hierarchy.swift"; sourceTree = "<group>"; };
+		04D42E001CC0250C00880D70 /* IQUIViewController+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIViewController+Additions.swift"; sourceTree = "<group>"; };
+		04D42E011CC0250C00880D70 /* IQUIWindow+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIWindow+Hierarchy.swift"; sourceTree = "<group>"; };
+		04D42E031CC0250C00880D70 /* IQKeyboardManagerConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstants.swift; sourceTree = "<group>"; };
+		04D42E041CC0250C00880D70 /* IQKeyboardManagerConstantsInternal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManagerConstantsInternal.swift; sourceTree = "<group>"; };
+		04D42E051CC0250C00880D70 /* IQKeyboardManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardManager.swift; sourceTree = "<group>"; };
+		04D42E061CC0250C00880D70 /* IQKeyboardReturnKeyHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQKeyboardReturnKeyHandler.swift; sourceTree = "<group>"; };
+		04D42E081CC0250C00880D70 /* IQTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTextView.swift; sourceTree = "<group>"; };
+		04D42E0A1CC0250C00880D70 /* IQBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQBarButtonItem.swift; sourceTree = "<group>"; };
+		04D42E0B1CC0250C00880D70 /* IQPreviousNextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQPreviousNextView.swift; sourceTree = "<group>"; };
+		04D42E0C1CC0250C00880D70 /* IQTitleBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQTitleBarButtonItem.swift; sourceTree = "<group>"; };
+		04D42E0D1CC0250C00880D70 /* IQToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IQToolbar.swift; sourceTree = "<group>"; };
+		04D42E0E1CC0250C00880D70 /* IQUIView+IQKeyboardToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IQUIView+IQKeyboardToolbar.swift"; sourceTree = "<group>"; };
+		04D42E101CC0250C00880D70 /* IQKeyboardManager.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = IQKeyboardManager.bundle; sourceTree = "<group>"; };
 		04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/iOS/SwiftyJSON.framework; sourceTree = "<group>"; };
 		6FFD1FEA1AD6C02D001DF798 /* SPHAddCardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SPHAddCardViewController.swift; sourceTree = "<group>"; };
 		94C095521B464F5A0017D024 /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = Carthage/Build/iOS/CryptoSwift.framework; sourceTree = "<group>"; };
@@ -369,6 +335,7 @@
 				03C92A3A1ACC26B700422831 /* Demo */,
 				03788D761ACAA53E007FC30F /* Frameworks */,
 				03788D461AC978DD007FC30F /* Products */,
+				04D42DFA1CC0250C00880D70 /* IQKeyboardManagerSwift */,
 			);
 			sourceTree = "<group>";
 		};
@@ -448,7 +415,6 @@
 		03788D761ACAA53E007FC30F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				049369871CB411AA0012C895 /* IQKeyboardManagerSwift */,
 				0448524A1B396FC90034D0CA /* Alamofire */,
 				04E99B261B13176800BCCDA1 /* SwiftyJSON.framework */,
 				0405D65B1B0A15B70050CA82 /* CryptoSwift.framework */,
@@ -649,66 +615,66 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		049369871CB411AA0012C895 /* IQKeyboardManagerSwift */ = {
+		04D42DFA1CC0250C00880D70 /* IQKeyboardManagerSwift */ = {
 			isa = PBXGroup;
 			children = (
-				049369881CB411AA0012C895 /* Categories */,
-				0493698F1CB411AA0012C895 /* Constants */,
-				049369921CB411AA0012C895 /* IQKeyboardManager.swift */,
-				049369931CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift */,
-				049369941CB411AA0012C895 /* IQTextView */,
-				049369961CB411AA0012C895 /* IQToolbar */,
-				0493699C1CB411AA0012C895 /* Resources */,
+				04D42DFB1CC0250C00880D70 /* Categories */,
+				04D42E021CC0250C00880D70 /* Constants */,
+				04D42E051CC0250C00880D70 /* IQKeyboardManager.swift */,
+				04D42E061CC0250C00880D70 /* IQKeyboardReturnKeyHandler.swift */,
+				04D42E071CC0250C00880D70 /* IQTextView */,
+				04D42E091CC0250C00880D70 /* IQToolbar */,
+				04D42E0F1CC0250C00880D70 /* Resources */,
 			);
 			path = IQKeyboardManagerSwift;
 			sourceTree = "<group>";
 		};
-		049369881CB411AA0012C895 /* Categories */ = {
+		04D42DFB1CC0250C00880D70 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				049369891CB411AA0012C895 /* IQNSArray+Sort.swift */,
-				0493698A1CB411AA0012C895 /* IQUIScrollView+Additions.swift */,
-				0493698B1CB411AA0012C895 /* IQUITextFieldView+Additions.swift */,
-				0493698C1CB411AA0012C895 /* IQUIView+Hierarchy.swift */,
-				0493698D1CB411AA0012C895 /* IQUIViewController+Additions.swift */,
-				0493698E1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift */,
+				04D42DFC1CC0250C00880D70 /* IQNSArray+Sort.swift */,
+				04D42DFD1CC0250C00880D70 /* IQUIScrollView+Additions.swift */,
+				04D42DFE1CC0250C00880D70 /* IQUITextFieldView+Additions.swift */,
+				04D42DFF1CC0250C00880D70 /* IQUIView+Hierarchy.swift */,
+				04D42E001CC0250C00880D70 /* IQUIViewController+Additions.swift */,
+				04D42E011CC0250C00880D70 /* IQUIWindow+Hierarchy.swift */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
 		};
-		0493698F1CB411AA0012C895 /* Constants */ = {
+		04D42E021CC0250C00880D70 /* Constants */ = {
 			isa = PBXGroup;
 			children = (
-				049369901CB411AA0012C895 /* IQKeyboardManagerConstants.swift */,
-				049369911CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift */,
+				04D42E031CC0250C00880D70 /* IQKeyboardManagerConstants.swift */,
+				04D42E041CC0250C00880D70 /* IQKeyboardManagerConstantsInternal.swift */,
 			);
 			path = Constants;
 			sourceTree = "<group>";
 		};
-		049369941CB411AA0012C895 /* IQTextView */ = {
+		04D42E071CC0250C00880D70 /* IQTextView */ = {
 			isa = PBXGroup;
 			children = (
-				049369951CB411AA0012C895 /* IQTextView.swift */,
+				04D42E081CC0250C00880D70 /* IQTextView.swift */,
 			);
 			path = IQTextView;
 			sourceTree = "<group>";
 		};
-		049369961CB411AA0012C895 /* IQToolbar */ = {
+		04D42E091CC0250C00880D70 /* IQToolbar */ = {
 			isa = PBXGroup;
 			children = (
-				049369971CB411AA0012C895 /* IQBarButtonItem.swift */,
-				049369981CB411AA0012C895 /* IQPreviousNextView.swift */,
-				049369991CB411AA0012C895 /* IQTitleBarButtonItem.swift */,
-				0493699A1CB411AA0012C895 /* IQToolbar.swift */,
-				0493699B1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift */,
+				04D42E0A1CC0250C00880D70 /* IQBarButtonItem.swift */,
+				04D42E0B1CC0250C00880D70 /* IQPreviousNextView.swift */,
+				04D42E0C1CC0250C00880D70 /* IQTitleBarButtonItem.swift */,
+				04D42E0D1CC0250C00880D70 /* IQToolbar.swift */,
+				04D42E0E1CC0250C00880D70 /* IQUIView+IQKeyboardToolbar.swift */,
 			);
 			path = IQToolbar;
 			sourceTree = "<group>";
 		};
-		0493699C1CB411AA0012C895 /* Resources */ = {
+		04D42E0F1CC0250C00880D70 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				0493699D1CB411AA0012C895 /* IQKeyboardManager.bundle */,
+				04D42E101CC0250C00880D70 /* IQKeyboardManager.bundle */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -909,7 +875,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				049369CE1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
+				04D42E211CC0250C00880D70 /* IQKeyboardManager.bundle in Resources */,
 				044852971B3970A10034D0CA /* Media.xcassets in Resources */,
 				04B48B4B1B3305AA00616048 /* Localizable.strings in Resources */,
 				03791CD41AD6960300FD80AC /* SPHClutch.storyboard in Resources */,
@@ -921,7 +887,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				049369CF1CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
 				04B48B501B3305AB00616048 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -932,7 +897,6 @@
 			files = (
 				04B48B5A1B3305AB00616048 /* InfoPlist.strings in Resources */,
 				03C92A431ACC26B700422831 /* Main.storyboard in Resources */,
-				049369D01CB411AA0012C895 /* IQKeyboardManager.bundle in Resources */,
 				04B48B5D1B33085200616048 /* Localizable.strings in Resources */,
 				03C92A481ACC26B700422831 /* LaunchScreen.xib in Resources */,
 				03C92A451ACC26B700422831 /* Images.xcassets in Resources */,
@@ -981,28 +945,28 @@
 			files = (
 				03788D6D1AC988D5007FC30F /* Extensions.swift in Sources */,
 				6FFD1FEB1AD6C02D001DF798 /* SPHAddCardViewController.swift in Sources */,
-				049369C21CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
-				049369C51CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
+				04D42E1D1CC0250C00880D70 /* IQPreviousNextView.swift in Sources */,
+				04D42E1E1CC0250C00880D70 /* IQTitleBarButtonItem.swift in Sources */,
 				03C92A341ACC235400422831 /* SPHClutchFormatter.swift in Sources */,
-				049369B31CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
-				049369CB1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				049369A11CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
-				049369A71CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
-				049369C81CB411AA0012C895 /* IQToolbar.swift in Sources */,
+				04D42E181CC0250C00880D70 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
+				04D42E201CC0250C00880D70 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
+				04D42E121CC0250C00880D70 /* IQUIScrollView+Additions.swift in Sources */,
+				04D42E141CC0250C00880D70 /* IQUIView+Hierarchy.swift in Sources */,
+				04D42E1F1CC0250C00880D70 /* IQToolbar.swift in Sources */,
 				04382FB31B0F616000FF6A08 /* Networking.swift in Sources */,
-				049369AA1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
-				049369B91CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
-				049369A41CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
+				04D42E151CC0250C00880D70 /* IQUIViewController+Additions.swift in Sources */,
+				04D42E1A1CC0250C00880D70 /* IQKeyboardReturnKeyHandler.swift in Sources */,
+				04D42E131CC0250C00880D70 /* IQUITextFieldView+Additions.swift in Sources */,
 				0456BD5B1AEE5B5800218197 /* Crypto.swift in Sources */,
 				03C92A641ACC29E900422831 /* SPHClutchFormLabel.swift in Sources */,
-				049369B61CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
+				04D42E191CC0250C00880D70 /* IQKeyboardManager.swift in Sources */,
 				03C92A321ACC226C00422831 /* SPHClutchTextField.swift in Sources */,
-				049369BF1CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
+				04D42E1C1CC0250C00880D70 /* IQBarButtonItem.swift in Sources */,
 				03788D641AC9793D007FC30F /* SPHClutch.swift in Sources */,
-				0493699E1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
-				049369B01CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
-				049369BC1CB411AA0012C895 /* IQTextView.swift in Sources */,
-				049369AD1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
+				04D42E111CC0250C00880D70 /* IQNSArray+Sort.swift in Sources */,
+				04D42E171CC0250C00880D70 /* IQKeyboardManagerConstants.swift in Sources */,
+				04D42E1B1CC0250C00880D70 /* IQTextView.swift in Sources */,
+				04D42E161CC0250C00880D70 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1010,24 +974,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				049369CC1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				049369A51CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
-				049369C61CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
-				049369B11CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
-				049369C01CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
-				049369BA1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
 				03788D861ACABEC5007FC30F /* SPHClutchSpec.swift in Sources */,
-				049369A21CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
-				049369AB1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
-				049369B41CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
 				04B48B421B29BB3A00616048 /* NetworkingSpec.swift in Sources */,
-				049369C91CB411AA0012C895 /* IQToolbar.swift in Sources */,
-				049369B71CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
-				049369A81CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
-				049369C31CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
-				049369BD1CB411AA0012C895 /* IQTextView.swift in Sources */,
-				0493699F1CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
-				049369AE1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1035,24 +983,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				049369CD1CB411AA0012C895 /* IQUIView+IQKeyboardToolbar.swift in Sources */,
-				049369A61CB411AA0012C895 /* IQUITextFieldView+Additions.swift in Sources */,
-				049369C71CB411AA0012C895 /* IQTitleBarButtonItem.swift in Sources */,
-				049369B21CB411AA0012C895 /* IQKeyboardManagerConstants.swift in Sources */,
-				049369C11CB411AA0012C895 /* IQBarButtonItem.swift in Sources */,
-				049369BB1CB411AA0012C895 /* IQKeyboardReturnKeyHandler.swift in Sources */,
 				03C92A401ACC26B700422831 /* ViewController.swift in Sources */,
-				049369A31CB411AA0012C895 /* IQUIScrollView+Additions.swift in Sources */,
-				049369AC1CB411AA0012C895 /* IQUIViewController+Additions.swift in Sources */,
-				049369B51CB411AA0012C895 /* IQKeyboardManagerConstantsInternal.swift in Sources */,
 				03C92A3E1ACC26B700422831 /* AppDelegate.swift in Sources */,
-				049369CA1CB411AA0012C895 /* IQToolbar.swift in Sources */,
-				049369B81CB411AA0012C895 /* IQKeyboardManager.swift in Sources */,
-				049369A91CB411AA0012C895 /* IQUIView+Hierarchy.swift in Sources */,
-				049369C41CB411AA0012C895 /* IQPreviousNextView.swift in Sources */,
-				049369BE1CB411AA0012C895 /* IQTextView.swift in Sources */,
-				049369A01CB411AA0012C895 /* IQNSArray+Sort.swift in Sources */,
-				049369AF1CB411AA0012C895 /* IQUIWindow+Hierarchy.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Clutch/IQKeybordManagerSwift/.DS_Store b/Clutch/IQKeybordManagerSwift/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
deleted file mode 100755
index 53f2bcf..0000000
--- a/Clutch/IQKeybordManagerSwift/Categories/IQUIScrollView+Additions.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  IQUIScrollView+Additions.swift
-// https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-16 Iftekhar Qurashi.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-import UIKit
-
-private var kIQShouldRestoreScrollViewContentOffset = "kIQShouldRestoreScrollViewContentOffset"
-
-public extension UIScrollView {
-    
-    /**
-     To set customized distance from keyboard for textField/textView. Can't be less than zero
-     */
-    public var shouldRestoreScrollViewContentOffset: Bool {
-        get {
-            
-            if let aValue = objc_getAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset) as? Bool {
-                return aValue
-            } else {
-                return false
-            }
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &kIQShouldRestoreScrollViewContentOffset, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-}
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
deleted file mode 100755
index 9cc0f3e..0000000
--- a/Clutch/IQKeybordManagerSwift/Categories/IQUITextFieldView+Additions.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  IQUITextFieldView+Additions.swift
-// https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-16 Iftekhar Qurashi.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-import UIKit
-
-/**
-Uses default keyboard distance for textField.
-*/
-public let kIQUseDefaultKeyboardDistance = CGFloat.max
-
-private var kIQKeyboardDistanceFromTextField = "kIQKeyboardDistanceFromTextField"
-
-/**
-UIView category for managing UITextField/UITextView
-*/
-public extension UIView {
-
-    /**
-    To set customized distance from keyboard for textField/textView. Can't be less than zero
-    */
-    public var keyboardDistanceFromTextField: CGFloat {
-        get {
-            
-            if let aValue = objc_getAssociatedObject(self, &kIQKeyboardDistanceFromTextField) as? CGFloat {
-                return aValue
-            } else {
-                return kIQUseDefaultKeyboardDistance
-            }
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &kIQKeyboardDistanceFromTextField, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-}
-
diff --git a/Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift b/Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift
deleted file mode 100755
index 8d6abb3..0000000
--- a/Clutch/IQKeybordManagerSwift/Categories/IQUIViewController+Additions.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-//  IQUIViewController+Additions.swift
-// https://github.com/hackiftekhar/IQKeyboardManager
-// Copyright (c) 2013-16 Iftekhar Qurashi.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-import UIKit
-
-
-private var kIQLayoutGuideConstraint = "kIQLayoutGuideConstraint"
-
-
-public extension UIViewController {
-
-    /**
-    To set customized distance from keyboard for textField/textView. Can't be less than zero
-    */
-    @IBOutlet public var IQLayoutGuideConstraint: NSLayoutConstraint? {
-        get {
-            
-            return objc_getAssociatedObject(self, &kIQLayoutGuideConstraint) as? NSLayoutConstraint
-        }
-
-        set(newValue) {
-            objc_setAssociatedObject(self, &kIQLayoutGuideConstraint, newValue,objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-}
\ No newline at end of file
diff --git a/Clutch/Networking.swift b/Clutch/Networking.swift
index 0415e96..ddf2ec9 100644
--- a/Clutch/Networking.swift
+++ b/Clutch/Networking.swift
@@ -71,7 +71,7 @@ public class Networking {
             if let errorMessage = response.result.error {
                 print("Networking.helperGetTransactionId most likely received malformed data from server.")
                 failure(errorMessage)
-            } else if let json: AnyObject = response.data{
+            } else if let json: AnyObject = response.result.value {
                 let transactionId = JSON(json)["id"].stringValue
                 
                 if transactionId.characters.count > 0
@@ -93,7 +93,7 @@ public class Networking {
             if let errorMessage = response.result.error {
                 print("Networking.getKey most likely received malformed data from server.")
                 failure(errorMessage)
-            } else if let json: AnyObject = response.data {
+            } else if let json: AnyObject = response.result.value {
                 let key = JSON(json)["key"].stringValue
                 if key.characters.count > 0 && self.doesContainValidRequestId(response.response, requestId: reqId)
                 {
@@ -127,7 +127,7 @@ public class Networking {
                 if let errorMessage = response.result.error {
                     print("Networking.tokenize most likely received malformed data from server.")
                     failure(errorMessage)
-                } else if let json: AnyObject = response.data {
+                } else if let json: AnyObject = response.result.value {
                     let code = JSON(json)["result"]["code"].int
                     let message = JSON(json)["result"]["message"].stringValue
                     
diff --git a/ClutchDemo/AppDelegate.swift b/ClutchDemo/AppDelegate.swift
index 4823c0e..f45219a 100644
--- a/ClutchDemo/AppDelegate.swift
+++ b/ClutchDemo/AppDelegate.swift
@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
         
-        let sphBackendDevAddress  = "http://127.0.0.1:9000"
+        let sphBackendDevAddress  = "https://v1-hub-mobile.sph-test-solinor.com"
 
         SPHClutch.initSharedInstance("test_merchantId", accountId: "test", mobileApiAddress: sphBackendDevAddress)
         
diff --git a/ClutchDemo/Info.plist b/ClutchDemo/Info.plist
index 9776181..5c08c10 100644
--- a/ClutchDemo/Info.plist
+++ b/ClutchDemo/Info.plist
@@ -36,5 +36,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSAllowsArbitraryLoads</key><true/>
+    </dict>
 </dict>
 </plist>
diff --git a/ClutchDemo/ViewController.swift b/ClutchDemo/ViewController.swift
index c87f6f9..792b411 100644
--- a/ClutchDemo/ViewController.swift
+++ b/ClutchDemo/ViewController.swift
@@ -30,7 +30,7 @@ class ViewController: UIViewController {
   
     @IBAction func addCard(sender: UIButton) {
         
-        let mobileBackendDevAddress = "http://127.0.0.1:8081"
+        let mobileBackendDevAddress = "http://54.194.196.206:8081"
         
         let mobileBackendStagingAddress = "http://54.194.196.206:8081"
         

From 35960f6d9775faf3eb97fc00e752741ed915d62e Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Fri, 15 Apr 2016 15:23:07 +0300
Subject: [PATCH 08/11] Remove line that makes the app crash

---
 Clutch/Crypto.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index 2280b55..23b3f3f 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -57,13 +57,12 @@ private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
     return encryptedData
 }
 
-public func encryptWithRsaAes(data: String?, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
+public func encryptWithRsaAes(data: String, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
 {
-    let cipher = (dispatch_queue_create("", DISPATCH_QUEUE_SERIAL) as! Cipher).dynamicType
     let keyAes = cipher.randomIV(AES.blockSize)
     let iv = cipher.randomIV(AES.blockSize)
     
-    /*if let encryptedData = try CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data!.utf8), padding: PKCS7())
+    /*if let encryptedData = CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data.utf8), padding: PKCS7())
     {
         if let publicKey = loadDER(NSData(base64EncodedString: certificateBase64Der, options: [])!)
         {

From bf9a2f483340014fea485d3373132c5ca1b6da5c Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Fri, 15 Apr 2016 15:27:00 +0300
Subject: [PATCH 09/11] Comment Cipher code to prevent compiling errors

---
 Clutch/Crypto.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index 23b3f3f..087e000 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -59,8 +59,8 @@ private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
 
 public func encryptWithRsaAes(data: String, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
 {
-    let keyAes = cipher.randomIV(AES.blockSize)
-    let iv = cipher.randomIV(AES.blockSize)
+    //let keyAes = Cipher.randomIV(AES.blockSize)
+    //let iv = Cipher.randomIV(AES.blockSize)
     
     /*if let encryptedData = CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data.utf8), padding: PKCS7())
     {

From 7c31a34131c75e7e540b30b93300c54b61d42927 Mon Sep 17 00:00:00 2001
From: Rolando Ojeda <rolando.ojeda@solinor.com>
Date: Fri, 15 Apr 2016 22:58:17 +0300
Subject: [PATCH 10/11] Fix encryption issues, tested Tokenisation OK

---
 Clutch/Crypto.swift | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Clutch/Crypto.swift b/Clutch/Crypto.swift
index 087e000..8f03f09 100644
--- a/Clutch/Crypto.swift
+++ b/Clutch/Crypto.swift
@@ -59,25 +59,30 @@ private func encryptWithData(content :NSData, publicKey :SecKeyRef) -> NSData? {
 
 public func encryptWithRsaAes(data: String, certificateBase64Der: String) -> (encryptedBase64Message: String, encryptedBase64Key: String, iv: String)?
 {
-    //let keyAes = Cipher.randomIV(AES.blockSize)
-    //let iv = Cipher.randomIV(AES.blockSize)
+    let keyAes = AES.randomIV(AES.blockSize)
+    let iv = AES.randomIV(AES.blockSize)
     
-    /*if let encryptedData = CryptoSwift.AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data.utf8), padding: PKCS7())
-    {
-        if let publicKey = loadDER(NSData(base64EncodedString: certificateBase64Der, options: [])!)
+    do{
+        if let encryptedData: [UInt8] = try AES(key: keyAes, iv: iv, blockMode: CryptoSwift.CipherBlockMode.CBC).encrypt([UInt8](data.utf8), padding: PKCS7())
         {
-            if let encryptedKey = encryptWithData(NSData(bytes: keyAes, length: keyAes.count), publicKey: publicKey)
+            if let publicKey = loadDER(NSData(base64EncodedString: certificateBase64Der, options: [])!)
             {
-                let encryptedBase64Message =  NSData(bytes: encryptedData, length: encryptedData.count).base64EncodedStringWithOptions(.allZeros)
-                
-                let encryptedBase64Key = encryptedKey.base64EncodedStringWithOptions([])
-                
-                let base64Iv = NSData(bytes: iv, length: iv.count).base64EncodedStringWithOptions([])
-                
-                return (encryptedBase64Message, encryptedBase64Key, base64Iv)
+                if let encryptedKey = encryptWithData(NSData(bytes: keyAes, length: keyAes.count), publicKey: publicKey)
+                {
+                    let encryptedBase64Message =  NSData(bytes: encryptedData, length: encryptedData.count).base64EncodedStringWithOptions([])
+                    
+                    let encryptedBase64Key = encryptedKey.base64EncodedStringWithOptions([])
+                    
+                    let base64Iv = NSData(bytes: iv, length: iv.count).base64EncodedStringWithOptions([])
+                    
+                    return (encryptedBase64Message, encryptedBase64Key, base64Iv)
+                }
             }
         }
-    }*/
-    return nil
+
+    }catch{
+        //TODO handle errors
+    }
+        return nil
 }
 

From 6d41d9684873061a6a82c16c93c96bdbbe03c0bf Mon Sep 17 00:00:00 2001
From: Arno Hietanen <arno.hietanen@gmail.com>
Date: Thu, 21 Apr 2016 13:42:33 +0300
Subject: [PATCH 11/11] Updated the tag name in the readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index fd37d95..498bfe5 100644
--- a/readme.md
+++ b/readme.md
@@ -35,7 +35,7 @@ Currently only Carthage is supported. CocoaPods release is planned and manual in
 
 1. Create a "Cartfile"-file in the root of your project and add a line within: 
 ```
-github "solinor/paymenthighway-ios-framework" "v-1.0" 
+github "solinor/paymenthighway-ios-framework" "v-1.0.1" 
 ```
 
 2. Run command