diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme
index dc0324a8..3cb14f30 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-iOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-iOS.xcscheme
index 307ec817..8e2909dc 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-iOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-watchOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-watchOS.xcscheme
index 320386a9..64df8176 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-watchOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme
index 579ec55c..337b9445 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-iOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-iOS.xcscheme
index b0bc7305..6eebbfad 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-iOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-watchOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-watchOS.xcscheme
index 28a80a88..8ff46a83 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-watchOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme
index 912fdae4..4ea9b0fb 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-iOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-iOS.xcscheme
index 3653298d..6606e4ca 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-iOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-watchOS.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-watchOS.xcscheme
index e1c5fe77..5ffb4688 100644
--- a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-watchOS.xcscheme
+++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj
index 8c9bbfa2..7c493ad7 100644
--- a/RxExample/RxExample.xcodeproj/project.pbxproj
+++ b/RxExample/RxExample.xcodeproj/project.pbxproj
@@ -294,7 +294,7 @@
 		C8DF92EA1B0B38C0009BCF9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E91B0B38C0009BCF9A /* Images.xcassets */; };
 		C8DF92EB1B0B38C0009BCF9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E91B0B38C0009BCF9A /* Images.xcassets */; };
 		C8DF92F61B0B43A4009BCF9A /* IntroductionExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92F51B0B43A4009BCF9A /* IntroductionExampleViewController.swift */; };
-		EC91FB951BBA144400973245 /* GitHubSearchRepositoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC91FB941BBA144400973245 /* GitHubSearchRepositoriesViewController.swift */; settings = {ASSET_TAGS = (); }; };
+		EC91FB951BBA144400973245 /* GitHubSearchRepositoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC91FB941BBA144400973245 /* GitHubSearchRepositoriesViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1273,7 +1273,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Krunoslav Zaher";
 				TargetAttributes = {
 					C83366DC1AD0293800C668A7 = {
@@ -1637,6 +1637,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
 				OTHER_SWIFT_FLAGS = "$(inherited) -D RX_NO_MODULE";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS-no-module";
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = ../RxCocoa/RxCocoa.h;
@@ -1651,6 +1652,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
 				OTHER_SWIFT_FLAGS = "$(inherited) -D RX_NO_MODULE";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS-no-module";
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = ../RxCocoa/RxCocoa.h;
@@ -1665,6 +1667,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
 				OTHER_SWIFT_FLAGS = "$(inherited) -D RX_NO_MODULE";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS-no-module";
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = ../RxCocoa/RxCocoa.h;
@@ -1693,6 +1696,7 @@
 				COPY_PHASE_STRIP = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1767,6 +1771,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
 			};
@@ -1779,6 +1784,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
 			};
@@ -1792,6 +1798,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -1804,6 +1811,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -1857,6 +1865,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
 			};
@@ -1870,6 +1879,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_LDFLAGS = "-objc_loadall";
+				PRODUCT_BUNDLE_IDENTIFIER = "Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
 			};
 			name = "Release-Tests";
diff --git a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme
index cac9eb64..237d82f8 100644
--- a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme
+++ b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
index 06354670..b81f5903 100644
--- a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
+++ b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS.xcscheme b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS.xcscheme
index 64e7e5e7..25894c0e 100644
--- a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS.xcscheme
+++ b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
index 7f285a43..3cfa0b22 100644
--- a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
+++ b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
@@ -206,7 +206,7 @@ class APIWrappersViewController: ViewController {
             }
             .addDisposableTo(disposeBag)
 
-        manager.rx_didFailWithError
+        _ = manager.rx_didFailWithError
             .subscribeNext { [weak self] x in
                 self?.debug("rx_didFailWithError \(x)")
             }
diff --git a/RxExample/RxExample/Examples/TableView/TableViewController.swift b/RxExample/RxExample/Examples/TableView/TableViewController.swift
index fd67115c..6245a79b 100644
--- a/RxExample/RxExample/Examples/TableView/TableViewController.swift
+++ b/RxExample/RxExample/Examples/TableView/TableViewController.swift
@@ -77,7 +77,7 @@ class TableViewController: ViewController, UITableViewDelegate {
             .addDisposableTo(disposeBag)
 
         // Rx content offset
-        tableView.rx_contentOffset
+        _ = tableView.rx_contentOffset
             .subscribeNext { co in
                 print("Content offset from Rx observer \(co)")
             }
diff --git a/RxExample/RxExample/Images.xcassets/AppIcon.appiconset/Contents.json b/RxExample/RxExample/Images.xcassets/AppIcon.appiconset/Contents.json
index d52c0ded..0342a564 100644
--- a/RxExample/RxExample/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/RxExample/RxExample/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -105,11 +105,6 @@
       "filename" : "Icon-76@2x.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "car",
-      "size" : "120x120",
-      "scale" : "1x"
-    },
     {
       "size" : "24x24",
       "idiom" : "watch",
diff --git a/RxExample/RxExample/Info-OSX.plist b/RxExample/RxExample/Info-OSX.plist
index 2bc41dc3..359805c8 100644
--- a/RxExample/RxExample/Info-OSX.plist
+++ b/RxExample/RxExample/Info-OSX.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -20,9 +20,9 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 </dict>
 </plist>
diff --git a/RxExample/RxExample/Info-iOS.plist b/RxExample/RxExample/Info-iOS.plist
index ec238e9c..3f8076ad 100644
--- a/RxExample/RxExample/Info-iOS.plist
+++ b/RxExample/RxExample/Info-iOS.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>We need location</string>
 	<key>UILaunchStoryboardName</key>
@@ -38,11 +43,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
diff --git a/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme b/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme
index 4be56a2a..4f6e4922 100644
--- a/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme
+++ b/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-iOS.xcscheme b/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-iOS.xcscheme
index feb7418c..09011462 100644
--- a/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-iOS.xcscheme
+++ b/RxTests/RxTests.xcodeproj/xcshareddata/xcschemes/RxTests-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"