diff --git a/Rx.playground/SupportCode.remap b/Rx.playground/SupportCode.remap
index c589ad22..a7e12062 100644
--- a/Rx.playground/SupportCode.remap
+++ b/Rx.playground/SupportCode.remap
@@ -1,21 +1,21 @@
 [
  {
-  "file": "/Users/jamie.pinkham/Documents/Source/Forks/RxSwift/Rx.playground/Sources/SupportCode.swift",
+  "file": "/Users/kzaher/Projects/RxSwift/Rx.playground/Sources/SupportCode.swift",
   "offset": 245,
   "text": "_ ",
  },
  {
-  "file": "/Users/jamie.pinkham/Documents/Source/Forks/RxSwift/Rx.playground/Sources/SupportCode.swift",
+  "file": "/Users/kzaher/Projects/RxSwift/Rx.playground/Sources/SupportCode.swift",
   "offset": 335,
   "remove": 13,
  },
  {
-  "file": "/Users/jamie.pinkham/Documents/Source/Forks/RxSwift/Rx.playground/Sources/SupportCode.swift",
+  "file": "/Users/kzaher/Projects/RxSwift/Rx.playground/Sources/SupportCode.swift",
   "offset": 397,
   "text": "_ ",
  },
  {
-  "file": "/Users/jamie.pinkham/Documents/Source/Forks/RxSwift/Rx.playground/Sources/SupportCode.swift",
+  "file": "/Users/kzaher/Projects/RxSwift/Rx.playground/Sources/SupportCode.swift",
   "offset": 714,
   "text": "_ ",
  }
diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj
index d45452c6..8ec4b9cb 100644
--- a/RxExample/RxExample.xcodeproj/project.pbxproj
+++ b/RxExample/RxExample.xcodeproj/project.pbxproj
@@ -1321,6 +1321,7 @@
 				PRODUCT_NAME = RxExample;
 				SDKROOT = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1363,6 +1364,7 @@
 				OTHER_SWIFT_FLAGS = "-D RELEASE";
 				PRODUCT_NAME = RxExample;
 				SDKROOT = "";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1379,7 +1381,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1395,7 +1396,6 @@
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1411,7 +1411,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kzaher.RxExample-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxExample-iOS.app/RxExample-iOS";
 			};
 			name = Debug;
@@ -1429,7 +1428,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxExample-iOS.app/RxExample-iOS";
 			};
 			name = Release;
@@ -1447,7 +1445,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxExample-iOS.app/RxExample-iOS";
 			};
 			name = "Release-Tests";
@@ -1461,7 +1458,6 @@
 				OTHER_LDFLAGS = "-objc_loadall";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1475,7 +1471,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1518,6 +1513,7 @@
 				OTHER_SWIFT_FLAGS = "-D TRACE_RESOURCES";
 				PRODUCT_NAME = RxExample;
 				SDKROOT = "";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1535,7 +1531,6 @@
 				PRODUCT_NAME = "RxExample-iOS";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = "Release-Tests";
 		};
@@ -1549,7 +1544,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = "Release-Tests";
 		};