diff --git a/.gitignore b/.gitignore
index 8615121b24a361eb4d1a5f1d06ca38d91202f7ec..a528cff3f89282f4f492d86789a92b1deeab43b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# MacOS
+.DS_Store
+
 # Xcode
 #
 build/
diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj
index 452beb6619a07f13d498e826e3455a24f215ac74..917e94d17af7b19fb547864dddb9f762898fa1a3 100644
--- a/Zip.xcodeproj/project.pbxproj
+++ b/Zip.xcodeproj/project.pbxproj
@@ -493,7 +493,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Roy Marmelstein";
 				TargetAttributes = {
 					343F50FE1C8DAEEC0028C434 = {
@@ -504,9 +504,11 @@
 					};
 					347E3A731C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					347E3A7D1C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -714,6 +716,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -762,6 +765,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -901,6 +905,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -922,6 +927,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -932,6 +939,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -942,6 +950,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
index f802b86d77595215664fcbc48ebf23457a6425c3..dbc1918043198585f5287149f8a64a984f18a549 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme	
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
index 7af7dc313c518fe154a9fbb6a6d3b11379b1d531..56c103b38fe18e87b30bd21565d9ce031fbca206 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme	
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
index 4ff2ce2bbb14da1ad05a7af6512c3080ea9eae6f..bb47f57c622babfeee90338a687585304654a3cf 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
index d63835122cddee1897117295d714249faa6e70a4..f9e4d6ebc376553b959ffc78c6cf14b72b5cfdd2 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip/QuickZip.swift b/Zip/QuickZip.swift
index 3cb1548e6af39fae823868b8a7649962ec91f67c..31fc886c698ac4048d6e95fa450294fa53159124 100644
--- a/Zip/QuickZip.swift
+++ b/Zip/QuickZip.swift
@@ -45,8 +45,8 @@ extension Zip {
         let directoryName = fileName.stringByReplacingOccurrencesOfString(".\(fileExtension)", withString: "")
         let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
         let destinationUrl = documentsUrl.URLByAppendingPathComponent(directoryName, isDirectory: true)
-        try self.unzipFile(path, destination: destinationUrl, overwrite: true, password: nil, progress: progress)
-        return destinationUrl
+        try self.unzipFile(path, destination: destinationUrl!, overwrite: true, password: nil, progress: progress)
+        return destinationUrl!
     }
     
     //MARK: Quick Zip
@@ -84,9 +84,9 @@ extension Zip {
         let fileManager = NSFileManager.defaultManager()
         let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
         let destinationUrl = documentsUrl.URLByAppendingPathComponent("\(fileName).zip")
-        try self.zipFiles(paths, zipFilePath: destinationUrl, password: nil, progress: progress)
-        return destinationUrl
+        try self.zipFiles(paths, zipFilePath: destinationUrl!, password: nil, progress: progress)
+        return destinationUrl!
     }
     
     
-}
\ No newline at end of file
+}
diff --git a/Zip/Zip.swift b/Zip/Zip.swift
index 4ae40fecf68b50a209a68d8dfb220e14d96f24ae..f6126654e0ef9cb4d11cab9346eb6be1ff35fa0b 100644
--- a/Zip/Zip.swift
+++ b/Zip/Zip.swift
@@ -139,7 +139,7 @@ public class Zip {
             if pathString.rangeOfCharacterFromSet(NSCharacterSet(charactersInString: "/\\")) != nil {
                 pathString = pathString.stringByReplacingOccurrencesOfString("\\", withString: "/")
             }
-            guard let fullPath = destination.URLByAppendingPathComponent(pathString).path else {
+            guard let fullPath = destination.URLByAppendingPathComponent(pathString)!.path else {
                 throw ZipError.UnzipFail
             }
             let creationDate = NSDate()
diff --git a/Zip/ZipUtilities.swift b/Zip/ZipUtilities.swift
index dd9b0d9885de70d3296f6e6c28fe54c173fca779..a50bca8b6e59a07c3a45c4d0b4bf061b8d466d26 100644
--- a/Zip/ZipUtilities.swift
+++ b/Zip/ZipUtilities.swift
@@ -72,18 +72,18 @@ internal class ZipUtilities {
         if let directoryPath = directory.path, let enumerator = fileManager.enumeratorAtPath(directoryPath) {
             while let filePathComponent = enumerator.nextObject() as? String {
                 let path = directory.URLByAppendingPathComponent(filePathComponent)
-                guard let filePath = path.path, let directoryName = directory.lastPathComponent else {
+                guard let filePath = path!.path, let directoryName = directory.lastPathComponent else {
                     continue
                 }
                 var isDirectory: ObjCBool = false
                 fileManager.fileExistsAtPath(filePath, isDirectory: &isDirectory)
                 if !isDirectory {
                     let fileName = (directoryName as NSString).stringByAppendingPathComponent(filePathComponent)
-                    let processedPath = ProcessedFilePath(filePathURL: path, fileName: fileName)
+                    let processedPath = ProcessedFilePath(filePathURL: path!, fileName: fileName)
                     processedFilePaths.append(processedPath)
                 }
                 else {
-                    let directoryContents = expandDirectoryFilePath(path)
+                    let directoryContents = expandDirectoryFilePath(path!)
                     processedFilePaths.appendContentsOf(directoryContents)
                 }
             }
@@ -91,4 +91,4 @@ internal class ZipUtilities {
         return processedFilePaths
     }
 
-}
\ No newline at end of file
+}
diff --git a/ZipTests/ZipTests.swift b/ZipTests/ZipTests.swift
index 153d01d0017ef791a300f862b4bfabd7085ca159..85a32c6938804b44f91c614482fdd6355c550eec 100644
--- a/ZipTests/ZipTests.swift
+++ b/ZipTests/ZipTests.swift
@@ -128,7 +128,7 @@ class ZipTests: XCTestCase {
             let zipFilePath = documentsFolder.URLByAppendingPathComponent("archive.zip")
             
             progress.becomeCurrentWithPendingUnitCount(1)
-            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath, password: nil, progress: nil)
+            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: nil)
             progress.resignCurrent()
             
             XCTAssertTrue(progress.totalUnitCount == progress.completedUnitCount)
@@ -158,15 +158,15 @@ class ZipTests: XCTestCase {
             let imageURL1 = NSBundle(forClass: ZipTests.self).URLForResource("3crBXeO", withExtension: "gif")!
             let imageURL2 = NSBundle(forClass: ZipTests.self).URLForResource("kYkLkPf", withExtension: "gif")!
             let folderURL = NSBundle(forClass: ZipTests.self).bundleURL.URLByAppendingPathComponent("Directory")
-            let targetImageURL1 = folderURL.URLByAppendingPathComponent("3crBXeO.gif")
-            let targetImageURL2 = folderURL.URLByAppendingPathComponent("kYkLkPf.gif")
-            if fileManager.fileExistsAtPath(folderURL.path!) {
-                try fileManager.removeItemAtURL(folderURL)
+            let targetImageURL1 = folderURL!.URLByAppendingPathComponent("3crBXeO.gif")
+            let targetImageURL2 = folderURL!.URLByAppendingPathComponent("kYkLkPf.gif")
+            if fileManager.fileExistsAtPath(folderURL!.path!) {
+                try fileManager.removeItemAtURL(folderURL!)
             }
-            try fileManager.createDirectoryAtURL(folderURL, withIntermediateDirectories: false, attributes: nil)
-            try fileManager.copyItemAtURL(imageURL1, toURL: targetImageURL1)
-            try fileManager.copyItemAtURL(imageURL2, toURL: targetImageURL2)
-            let destinationURL = try Zip.quickZipFiles([folderURL], fileName: "directory")
+            try fileManager.createDirectoryAtURL(folderURL!, withIntermediateDirectories: false, attributes: nil)
+            try fileManager.copyItemAtURL(imageURL1, toURL: targetImageURL1!)
+            try fileManager.copyItemAtURL(imageURL2, toURL: targetImageURL2!)
+            let destinationURL = try Zip.quickZipFiles([folderURL!], fileName: "directory")
             XCTAssertTrue(fileManager.fileExistsAtPath(destinationURL.path!))
         }
         catch {
@@ -181,11 +181,11 @@ class ZipTests: XCTestCase {
             let imageURL2 = NSBundle(forClass: ZipTests.self).URLForResource("kYkLkPf", withExtension: "gif")!
             let documentsFolder = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
             let zipFilePath = documentsFolder.URLByAppendingPathComponent("archive.zip")
-            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath, password: nil, progress: { (progress) -> () in
+            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: { (progress) -> () in
                 print(progress)
             })
             let fileManager = NSFileManager.defaultManager()
-            XCTAssertTrue(fileManager.fileExistsAtPath(zipFilePath.path!))
+            XCTAssertTrue(fileManager.fileExistsAtPath((zipFilePath?.path)!))
         }
         catch {
             XCTFail()
@@ -198,19 +198,23 @@ class ZipTests: XCTestCase {
             let imageURL2 = NSBundle(forClass: ZipTests.self).URLForResource("kYkLkPf", withExtension: "gif")!
             let documentsFolder = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
             let zipFilePath = documentsFolder.URLByAppendingPathComponent("archive.zip")
-            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath, password: "password", progress: { (progress) -> () in
+            try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: "password", progress: { (progress) -> () in
                 print(progress)
             })
             let fileManager = NSFileManager.defaultManager()
-            XCTAssertTrue(fileManager.fileExistsAtPath(zipFilePath.path!))
-            guard let fileExtension = zipFilePath.pathExtension, let fileName = zipFilePath.lastPathComponent else {
+            XCTAssertTrue(fileManager.fileExistsAtPath((zipFilePath?.path)!))
+
+            let fileExtension = zipFilePath!.pathExtension
+            let fileName = (zipFilePath?.lastPathComponent)!
+            
+            guard fileExtension != nil && fileName.characters.count > 0  else {
                 throw ZipError.UnzipFail
             }
             let directoryName = fileName.stringByReplacingOccurrencesOfString(".\(fileExtension)", withString: "")
             let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
             let destinationUrl = documentsUrl.URLByAppendingPathComponent(directoryName, isDirectory: true)
-            try Zip.unzipFile(zipFilePath, destination: destinationUrl, overwrite: true, password: "password", progress: nil)
-            XCTAssertTrue(fileManager.fileExistsAtPath(destinationUrl.path!))
+            try Zip.unzipFile(zipFilePath!, destination: destinationUrl!, overwrite: true, password: "password", progress: nil)
+            XCTAssertTrue(fileManager.fileExistsAtPath(destinationUrl!.path!))
         }
         catch {
             XCTFail()
@@ -225,11 +229,11 @@ class ZipTests: XCTestCase {
             let fileManager = NSFileManager.defaultManager()
             
             let subDir = unzipDestination.URLByAppendingPathComponent("subDir")
-            let imageURL = subDir.URLByAppendingPathComponent("r2W9yu9").URLByAppendingPathExtension("gif")
+            let imageURL = subDir!.URLByAppendingPathComponent("r2W9yu9")!.URLByAppendingPathExtension("gif")
             
             XCTAssertTrue(fileManager.fileExistsAtPath(unzipDestination.path!))
-            XCTAssertTrue(fileManager.fileExistsAtPath(subDir.path!))
-            XCTAssertTrue(fileManager.fileExistsAtPath(imageURL.path!))
+            XCTAssertTrue(fileManager.fileExistsAtPath(subDir!.path!))
+            XCTAssertTrue(fileManager.fileExistsAtPath(imageURL!.path!))
         } catch {
             XCTFail()
         }