diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08ed10c..bd4c9c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to CreditCardRow will be documented in this file.
 
+### [2.1.0](https://github.com/EurekaCommunity/GenericPasswordRow/releases/tag/2.1.0)
+<!-- Released on 2017-04-25. -->
+
+* Added Eureka 3.0.0 support
+
 ### [2.0.0](https://github.com/xmartlabs/CreditCardRow/releases/tag/2.0.0)
 <!-- Released on 2016-10-18. -->
 
diff --git a/Cartfile b/Cartfile
index 4d11dfe..89ae4e3 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1 @@
-github "xmartlabs/Eureka" ~> 2.0.0
+github "xmartlabs/Eureka" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index cacac4d..0a8f51c 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "xmartlabs/Eureka" "2.0.0-beta.1"
+github "xmartlabs/Eureka" "3.0.0"
diff --git a/CreditCardRow.podspec b/CreditCardRow.podspec
index 581258b..b5215ab 100644
--- a/CreditCardRow.podspec
+++ b/CreditCardRow.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "CreditCardRow"
-  s.version          = "2.0.0"
+  s.version          = "2.1.0"
   s.summary          = "An Eureka row that allows the user to input a credit card number with optional CVC and expiration date."
   s.homepage         = "https://github.com/EurekaCommunity/CreditCardRow"
   s.license          = { type: 'MIT', file: 'LICENSE' }
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
     'CreditCardRow' => ['Sources/CreditCardCell.xib']
   }
   s.ios.frameworks = 'UIKit', 'Foundation'
-  s.dependency 'Eureka', '~> 2.0.0-beta.1'
+  s.dependency 'Eureka', '3.0'
 end
diff --git a/README.md b/README.md
index 8475a2a..ad400b0 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ class ViewController: FormViewController {
 ## Requirements
 
 * iOS 8.0+
-* Xcode 8+
+* Xcode 8.3+
 
 ## Getting involved
 
diff --git a/Sources/CreditCardCell.swift b/Sources/CreditCardCell.swift
index 30294e8..6e38968 100644
--- a/Sources/CreditCardCell.swift
+++ b/Sources/CreditCardCell.swift
@@ -175,7 +175,7 @@ open class CreditCardCell: Cell<CreditCardInfo>, UITextFieldDelegate, CellType {
             expirationField?.becomeFirstResponder()
         }
         else if expirationField?.isFirstResponder == true {
-            sender == inputAccessoryView.previousButton ? numberField.becomeFirstResponder() : cvvField?.becomeFirstResponder()
+            _ = (sender == inputAccessoryView.previousButton ? numberField.becomeFirstResponder() : cvvField?.becomeFirstResponder())
         }
         else if cvvField?.isFirstResponder == true {
             expirationField?.becomeFirstResponder()