diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index fb13670..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 9b20a7c..30f5004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.xcodeproj/**/xcuserdata/
 *.xcscmblueprint
 /Carthage
-/Cartfile.resolved
 /.build
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
index 4a2c0a6..466856c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,67 @@
+os: osx
 language: objective-c
-osx_image: xcode8.3
-
-env:
-  - PLATFORM=Mac
-  - PLATFORM=iOS NAME='iPhone SE'
-  - PLATFORM=tvOS NAME='Apple TV 1080p'
-  - PLATFORM=watchOS
-
+matrix:
+  include:
+    - osx_image: xcode8.2
+      env: PLAT=macOS SWFT=3.0
+    - osx_image: xcode8.2
+      env: PLAT=iOS SWFT=3.0
+    - osx_image: xcode8.2
+      env: PLAT=tvOS SWFT=3.0
+    - osx_image: xcode8.2
+      env: PLAT=watchOS SWFT=3.0
+    - osx_image: xcode8.3
+      env: PLAT=macOS SWFT=3.1
+    - osx_image: xcode8.3
+      env: PLAT=iOS SWFT=3.1
+    - osx_image: xcode8.3
+      env: PLAT=tvOS SWFT=3.1
+    - osx_image: xcode8.3
+      env: PLAT=watchOS SWFT=3.1
+    - osx_image: xcode9
+      env: PLAT=macOS SWFT=3.2
+    - osx_image: xcode9
+      env: PLAT=iOS SWFT=3.2
+    - osx_image: xcode9
+      env: PLAT=tvOS SWFT=3.2
+    - osx_image: xcode9
+      env: PLAT=watchOS SWFT=3.2
+    - osx_image: xcode9
+      env: PLAT=macOS SWFT=4.0
+    - osx_image: xcode9
+      env: PLAT=iOS SWFT=4.0
+    - osx_image: xcode9
+      env: PLAT=tvOS SWFT=4.0
+    - osx_image: xcode9
+      env: PLAT=watchOS SWFT=4.0
 before_install:
-  - if [ -n "$NAME" ]; then
+  - case $PLAT in
+    iOS)
+      NAME="iPhone SE";;
+    tvOS)
+      NAME="Apple TV 1080p";;
+    watchOS)
+      NAME="Apple Watch - 38mm";;
+    esac;
+    if [ -n "$NAME" ]; then
       export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
     fi
-
 install:
-  - carthage bootstrap --platform $PLATFORM
-
+  - case $PLAT in
+    macOS)
+      carthage bootstrap --platform Mac;;
+    tvOS|iOS|watchOS)
+      carthage bootstrap --platform $PLAT;;
+    esac;
 script:
   - set -o pipefail;
-    case $PLATFORM in
-    Mac)
-      xcodebuild -scheme PMKAlamofire test | xcpretty;;
+    case $PLAT in
+    macOS)
+      xcodebuild -scheme PMKAlamofire -quiet test SWIFT_VERSION=$SWFT;;
     iOS|tvOS)
-      open -a "simulator" --args -CurrentDeviceUDID "$UUID";
-      xcodebuild -scheme PMKAlamofire -destination "id=$UUID" test | xcpretty;;
+      open -b com.apple.iphonesimulator --args -CurrentDeviceUDID "$UUID";
+      xcodebuild -scheme PMKAlamofire -destination "id=$UUID" -quiet clean build  SWIFT_VERSION=$SWFT;
+      xcodebuild -scheme PMKAlamofire -destination "id=$UUID" -quiet test;;
     watchOS)
-      xcodebuild -scheme PMKAlamofire -destination "name=Apple Watch - 38mm" | xcpretty;;
+      xcodebuild -scheme PMKAlamofire -destination "id=$UUID" -quiet clean build SWIFT_VERSION=$SWFT;
     esac
diff --git a/Cartfile.private b/Cartfile.private
index b0e1205..13f8280 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" "swift-3.0"
+github "AliSoftware/OHHTTPStubs" ~> 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
new file mode 100644
index 0000000..348a0e1
--- /dev/null
+++ b/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "Alamofire/Alamofire" "4.5.0"
+github "AliSoftware/OHHTTPStubs" "6.0.0"
+github "mxcl/PromiseKit" "4.3.2"
diff --git a/PMKAlamofire.xcodeproj/project.pbxproj b/PMKAlamofire.xcodeproj/project.pbxproj
index dd3d031..7e777ed 100644
--- a/PMKAlamofire.xcodeproj/project.pbxproj
+++ b/PMKAlamofire.xcodeproj/project.pbxproj
@@ -79,18 +79,16 @@
 			children = (
 				63C7FFDB1D5C00F2003BAE60 /* Alamofire+Promise.swift */,
 			);
-			name = Sources;
-			path = "PMK+UIKit";
-			sourceTree = "<group>";
+			path = Sources;
+			sourceTree = SOURCE_ROOT;
 		};
 		63C7FFF31D5C020D003BAE60 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
 				63C700021D5C021F003BAE60 /* TestAlamofire.swift */,
 			);
-			name = Tests;
-			path = PMKTests/NS;
-			sourceTree = "<group>";
+			path = Tests;
+			sourceTree = SOURCE_ROOT;
 		};
 /* End PBXGroup section */
 
@@ -147,17 +145,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Max Howell";
 				TargetAttributes = {
 					63C7FFA61D5BEE09003BAE60 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					63C7FFF11D5C020D003BAE60 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -238,7 +236,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -246,7 +246,12 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -296,7 +301,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -304,7 +311,12 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/PMKAlamofire.xcodeproj/xcshareddata/xcschemes/PMKAlamofire.xcscheme b/PMKAlamofire.xcodeproj/xcshareddata/xcschemes/PMKAlamofire.xcscheme
index 4f1f066..b9b1e4d 100644
--- a/PMKAlamofire.xcodeproj/xcshareddata/xcschemes/PMKAlamofire.xcscheme
+++ b/PMKAlamofire.xcodeproj/xcshareddata/xcschemes/PMKAlamofire.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -63,6 +64,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/README.markdown b/README.markdown
index 4c9ffdb..a1a0e99 100644
--- a/README.markdown
+++ b/README.markdown
@@ -2,6 +2,8 @@
 
 This project adds promises to [Alamofire](https://github.com/Alamofire/Alamofire).
 
+This project supports Swift 3.1, 3.2 and 4.0.
+
 ## Usage
 
 ```swift
diff --git a/Sources/Alamofire+Promise.swift b/Sources/Alamofire+Promise.swift
index d4094a7..66982c0 100644
--- a/Sources/Alamofire+Promise.swift
+++ b/Sources/Alamofire+Promise.swift
@@ -22,7 +22,7 @@ extension Alamofire.DataRequest {
                 if let error = rsp.error {
                     reject(error)
                 } else if let a = rsp.request, let b = rsp.response, let c = rsp.data {
-                    fulfill(a, b, c)
+                    fulfill((a, b, c))
                 } else {
                     reject(PMKError.invalidCallingConvention)
                 }
@@ -79,7 +79,7 @@ extension Alamofire.DataRequest {
             responseJSON(queue: nil, options: options, completionHandler: { response in
                 switch response.result {
                 case .success(let value):
-                    fulfill(value, PMKDataResponse(response))
+                    fulfill((value, PMKDataResponse(response)))
                 case .failure(let error):
                     reject(error)
                 }