diff --git a/CardIO.podspec b/CardIO.podspec
index 148eb70..c3e5aeb 100644
--- a/CardIO.podspec
+++ b/CardIO.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = 'CardIO'
-  spec.version          = '5.3.2'
+  spec.version          = '5.4.0'
   spec.license          = { type: 'MIT', file: 'LICENSE.md' }
   spec.homepage         = 'https://www.card.io'
   spec.authors          = { 'CardIO' => 'support@paypal.com' }
diff --git a/CardIO/CardIO.h b/CardIO/CardIO.h
index 815a3b1..a639f97 100644
--- a/CardIO/CardIO.h
+++ b/CardIO/CardIO.h
@@ -1,6 +1,6 @@
 //
 //  CardIO.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/CardIOCreditCardInfo.h b/CardIO/CardIOCreditCardInfo.h
index 908ec3b..ce5eb34 100644
--- a/CardIO/CardIOCreditCardInfo.h
+++ b/CardIO/CardIOCreditCardInfo.h
@@ -1,6 +1,6 @@
 //
 //  CardIOCreditCardInfo.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/CardIODetectionMode.h b/CardIO/CardIODetectionMode.h
index 8f7533c..a9d922a 100644
--- a/CardIO/CardIODetectionMode.h
+++ b/CardIO/CardIODetectionMode.h
@@ -1,6 +1,6 @@
 //
 //  CardIODetectionMode.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/CardIOPaymentViewController.h b/CardIO/CardIOPaymentViewController.h
index 0b5dd4c..58de9a1 100644
--- a/CardIO/CardIOPaymentViewController.h
+++ b/CardIO/CardIOPaymentViewController.h
@@ -1,6 +1,6 @@
 //
 //  CardIOPaymentViewController.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
@@ -42,20 +42,11 @@
 /// ar,da,de,en,en_AU,en_GB,es,es_MX,fr,he,is,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW.
 @property(nonatomic, copy, readwrite) NSString *languageOrLocale;
 
-/// If YES, the status bar's style will be kept as whatever your app has set it to.
-/// If NO, the status bar style will be set to the default style.
-/// Defaults to NO.
+/// @see keepStatusBarStyleForCardIO
 @property(nonatomic, assign, readwrite) BOOL keepStatusBarStyle;
-
-/// The default appearance of the navigation bar is navigationBarStyle == UIBarStyleDefault;
-/// tintColor == nil (pre-iOS 7), barTintColor == nil (iOS 7).
-/// Set either or both of these properties if you want to override these defaults.
-/// @see navigationBarTintColor
+/// @see navigationBarStyleForCardIO
 @property(nonatomic, assign, readwrite) UIBarStyle navigationBarStyle;
-/// The default appearance of the navigation bar is navigationBarStyle == UIBarStyleDefault;
-/// tintColor == nil (pre-iOS 7), barTintColor == nil (iOS 7).
-/// Set either or both of these properties if you want to override these defaults.
-/// @see navigationBarStyle
+/// @see navigationBarTintColorForCardIO
 @property(nonatomic, retain, readwrite) UIColor *navigationBarTintColor;
 
 /// Normally, card.io blurs the screen when the app is backgrounded,
@@ -185,3 +176,25 @@ extern NSString * const CardIOCurrentScanningOrientation;
 extern NSString * const CardIOScanningOrientationAnimationDuration;
 
 @end
+
+/// Methods with names that do not conflict with Apple's private APIs.
+@interface CardIOPaymentViewController (NonConflictingAPINames)
+
+/// If YES, the status bar's style will be kept as whatever your app has set it to.
+/// If NO, the status bar style will be set to the default style.
+/// Defaults to NO.
+@property(nonatomic, assign, readwrite) BOOL keepStatusBarStyleForCardIO;
+
+/// The default appearance of the navigation bar is navigationBarStyleForCardIO == UIBarStyleDefault;
+/// tintColor == nil (pre-iOS 7), barTintColor == nil (iOS 7).
+/// Set either or both of these properties if you want to override these defaults.
+/// @see navigationBarTintColorForCardIO
+@property(nonatomic, assign, readwrite) UIBarStyle navigationBarStyleForCardIO;
+
+/// The default appearance of the navigation bar is navigationBarStyleForCardIO == UIBarStyleDefault;
+/// tintColor == nil (pre-iOS 7), barTintColor == nil (iOS 7).
+/// Set either or both of these properties if you want to override these defaults.
+/// @see navigationBarStyleForCardIO
+@property(nonatomic, retain, readwrite) UIColor *navigationBarTintColorForCardIO;
+
+@end
\ No newline at end of file
diff --git a/CardIO/CardIOPaymentViewControllerDelegate.h b/CardIO/CardIOPaymentViewControllerDelegate.h
index ba234b6..8b9902b 100644
--- a/CardIO/CardIOPaymentViewControllerDelegate.h
+++ b/CardIO/CardIOPaymentViewControllerDelegate.h
@@ -1,6 +1,6 @@
 //
 //  CardIOPaymentViewControllerDelegate.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/CardIOUtilities.h b/CardIO/CardIOUtilities.h
index 7a64e75..d907846 100644
--- a/CardIO/CardIOUtilities.h
+++ b/CardIO/CardIOUtilities.h
@@ -1,6 +1,6 @@
 //
 //  CardIOUtilities.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
@@ -35,3 +35,19 @@
 + (UIImageView *)blurredScreenImageView;
 
 @end
+
+/// Methods with names that do not conflict with Apple's private APIs.
+@interface CardIOUtilities (NonConflictingAPINames)
+
+/// Please send the output of this method with any technical support requests.
+/// @return Human-readable version of this library.
++ (NSString *)cardIOLibraryVersion;
+
+/// The preload method prepares card.io to launch faster. Calling preload is optional but suggested.
+/// On an iPhone 5S, for example, preloading makes card.io launch ~400ms faster.
+/// The best time to call preload is when displaying a view from which card.io might be launched;
+/// e.g., inside your view controller's viewWillAppear: method.
+/// preload works in the background; the call to preload returns immediately.
++ (void)preloadCardIO;
+
+@end
\ No newline at end of file
diff --git a/CardIO/CardIOView.h b/CardIO/CardIOView.h
index f47a18a..74b941f 100644
--- a/CardIO/CardIOView.h
+++ b/CardIO/CardIOView.h
@@ -1,6 +1,6 @@
 //
 //  CardIOView.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/CardIOViewDelegate.h b/CardIO/CardIOViewDelegate.h
index 1da7f55..0f64423 100644
--- a/CardIO/CardIOViewDelegate.h
+++ b/CardIO/CardIOViewDelegate.h
@@ -1,6 +1,6 @@
 //
 //  CardIOViewDelegate.h
-//  Version 5.3.2
+//  Version 5.4.0
 //
 //  See the file "LICENSE.md" for the full license governing this code.
 //
diff --git a/CardIO/libCardIO.a b/CardIO/libCardIO.a
index f64cbfc..775a3ee 100644
Binary files a/CardIO/libCardIO.a and b/CardIO/libCardIO.a differ
diff --git a/README.md b/README.md
index c7f0fe0..839aa85 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Make an optional call to speed up the subsequent launch of card.io scanning:
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
-  [CardIOUtilities preload];
+  [CardIOUtilities preloadCardIO];
 }
 
 ```
@@ -202,7 +202,7 @@ Make an optional call to speed up the subsequent launch of card.io scanning:
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
-  [CardIOUtilities preload];
+  [CardIOUtilities preloadCardIO];
 }
 
 ```
@@ -287,7 +287,7 @@ Make an optional call to speed up the subsequent launch of card.io scanning:
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
-  [CardIOUtilities preload];
+  [CardIOUtilities preloadCardIO];
 }
 
 ```
@@ -338,4 +338,4 @@ Include a method to cancel card scanning:
 * Processing images can be memory intensive, so make sure to test that your app properly handles memory warnings.
 * For your users' security, [obscure your app's cached screenshots](https://viaforensics.com/resources/reports/best-practices-ios-android-secure-mobile-development/ios-avoid-cached-application-snapshots/).  
 **Note:** By default, a `CardIOPaymentViewController` automatically blurs its own screens when the app is backgrounded. A `CardIOView` does not do any automatic blurring.
-* The first time that you create either a `CardIOPaymentViewController` or a `CardIOView`, the card.io SDK must load resources, which can result in a noticeable delay. To avoid this delay you may optionally call `[CardIOUtilities preload]` in advance, so that this resource loading occurs in advance on a background thread.
+* The first time that you create either a `CardIOPaymentViewController` or a `CardIOView`, the card.io SDK must load resources, which can result in a noticeable delay. To avoid this delay you may optionally call `[CardIOUtilities preloadCardIO]` in advance, so that this resource loading occurs in advance on a background thread.
diff --git a/release_notes.txt b/release_notes.txt
index be8fc26..f7b8130 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,6 +1,20 @@
 card.io iOS SDK release notes
 =============================
 
+5.4.0 (Fri 09/16/2016)
+
+* Add methods with card.io specific signatures to avoid name collisions
+  ( https://github.com/card-io/card.io-iOS-SDK/issues/201 )
+* Add .m so that CocoaPods will generate CardIO modulemap. Thanks to @keith.
+  ( https://github.com/card-io/card.io-iOS-SDK/pull/210 )
+* Update CardIOViewStream's previewLayer to be CALayer. Thanks to @wisolith.
+  ( https://github.com/card-io/card.io-iOS-source/pull/63 )
+* Update CardIOVideoStream's delegate to be a UIResponder. Thanks to @reidmain.
+  ( https://github.com/card-io/card.io-iOS-source/pull/70 )
+* Remove incorrect warning about `suppressScanConfirmation`. Thanks to @kballard.
+  ( https://github.com/card-io/card.io-iOS-SDK/issues/217 )
+* Fix warnings when building from source
+
 5.3.2 (Mon 04/11/2016)
 
 * Fix memory management issues with CMSampleBufferRef causing crash