diff --git a/Source/Info.plist b/Source/Info.plist
index 5f59404..60b9c00 100644
--- a/Source/Info.plist
+++ b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.1</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/TPObfuscatedString.swift b/Source/TPObfuscatedString.swift
index a3c5c47..29d1286 100644
--- a/Source/TPObfuscatedString.swift
+++ b/Source/TPObfuscatedString.swift
@@ -113,6 +113,6 @@ public extension String {
     
 }
 
-private func UC(value: Int) -> String {
-    return String(Character(UnicodeScalar(value)))
-}
\ No newline at end of file
+private func UC(_ value: Int) -> String {
+    return String(Character(UnicodeScalar(value)!))
+}
diff --git a/Source/TPObfuscatedStringConverter.swift b/Source/TPObfuscatedStringConverter.swift
index 51eda8b..d42ec09 100644
--- a/Source/TPObfuscatedStringConverter.swift
+++ b/Source/TPObfuscatedStringConverter.swift
@@ -14,8 +14,8 @@ class TPObfuscatedStringConverter {
         let characters = phrase.characters
         var result = [String]()
         
-        let formatter = NSNumberFormatter()
-        formatter.numberStyle = NSNumberFormatterStyle.SpellOutStyle
+        let formatter = NumberFormatter()
+        formatter.numberStyle = NumberFormatter.Style.spellOut
         
         for c in characters {
             let s = String(c).unicodeScalars
@@ -25,7 +25,7 @@ class TPObfuscatedStringConverter {
                 result.append(String(c))
                 break
             case 48...57:
-                result.append(formatter.stringFromNumber(Int(String(c))!)!)
+                result.append(formatter.string(from: NSNumber(value: Int(String(c))!))!)
                 break
             case 32:
                 result.append("space")
@@ -131,8 +131,8 @@ class TPObfuscatedStringConverter {
                 break
             }
         }
-        return result.joinWithSeparator(".")
+        return result.joined(separator: ".")
     }
     
     
-}
\ No newline at end of file
+}
diff --git a/TPObfuscatedString.podspec b/TPObfuscatedString.podspec
index cf24789..d71bfda 100644
--- a/TPObfuscatedString.podspec
+++ b/TPObfuscatedString.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "TPObfuscatedString"
-  s.version      = "0.0.2"
+  s.version      = "1.0.0"
   s.license      = "MIT"
   s.summary      = "Simple and basic string obfuscating - based on UAObfuscatedString by Matt Coneybeare"  
   s.homepage     = "https://github.com/Techprimate/TPObfuscatedString"
diff --git a/TPObfuscatedString.xcodeproj/project.pbxproj b/TPObfuscatedString.xcodeproj/project.pbxproj
index d9a926d..80085ac 100644
--- a/TPObfuscatedString.xcodeproj/project.pbxproj
+++ b/TPObfuscatedString.xcodeproj/project.pbxproj
@@ -178,14 +178,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Philip Niedertscheider";
 				TargetAttributes = {
 					D4DB29441B8EFE0900E6E8D4 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
+						ProvisioningStyle = Manual;
 					};
 					D4DB296E1B8F017D00E6E8D4 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -269,8 +272,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -318,8 +323,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -339,6 +346,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -350,7 +358,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -361,6 +371,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -368,7 +379,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -378,16 +391,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.niedertscheider.philip.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		D4DB29791B8F017D00E6E8D4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -396,20 +406,18 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.niedertscheider.philip.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		D4DB297A1B8F017D00E6E8D4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				INFOPLIST_FILE = TPObfuscatedStringTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.niedertscheider.philip.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/TPObfuscatedString.xcodeproj/project.xcworkspace/xcuserdata/dan.xcuserdatad/UserInterfaceState.xcuserstate b/TPObfuscatedString.xcodeproj/project.xcworkspace/xcuserdata/dan.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 9f0c643..0000000
Binary files a/TPObfuscatedString.xcodeproj/project.xcworkspace/xcuserdata/dan.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/TPObfuscatedString.xcodeproj/xcshareddata/xcschemes/TPObfuscatedString.xcscheme b/TPObfuscatedString.xcodeproj/xcshareddata/xcschemes/TPObfuscatedString.xcscheme
index 798f836..b6938b1 100644
--- a/TPObfuscatedString.xcodeproj/xcshareddata/xcschemes/TPObfuscatedString.xcscheme
+++ b/TPObfuscatedString.xcodeproj/xcshareddata/xcschemes/TPObfuscatedString.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TPObfuscatedStringTests/TPObfuscatedStringTests.swift b/TPObfuscatedStringTests/TPObfuscatedStringTests.swift
index 154e653..1b3875e 100644
--- a/TPObfuscatedStringTests/TPObfuscatedStringTests.swift
+++ b/TPObfuscatedStringTests/TPObfuscatedStringTests.swift
@@ -19,7 +19,7 @@ class TPObfuscatedStringTests: XCTestCase {
 //        randomString = randomStringWithLength(100)
         randomString = "https://192.168.0.67"
         print(TPObStr.T.h.i.s.space.i.s.space.a.n.space.e.x.a.m.p.l.e.space.t.e.x.t.colon.space.H.i.exclamation)
-        method = TPObfuscatedStringConverter.convert(randomString)
+        method = TPObfuscatedStringConverter.convert(phrase: randomString)
     }
     
     override func tearDown() {
@@ -31,18 +31,18 @@ class TPObfuscatedStringTests: XCTestCase {
     func testExample() {
         print("Random string to test: \n" + randomString + "\n")
         print("Corresponding TPObfuscatedMethodCall:\n" + method + "\n")
-        let result = callMethod(method)
+        let result = callMethod(method: method)
         print("Result of method call: \n" + result + "\n")
         XCTAssert(result == randomString, "Pass")
     }
     
     func testPerformanceString() {
-        measureBlock { () -> Void in
+        measure { () -> Void in
             var _ = "z{OpsNY^3xo\"-WO[k<t ',@I4A]P>+0NGlXX&k()\t=&[#:th:t.Wb.Ow&dQ=\"aoi@s>N2_J<n1vt/i(vDeaKmX1Tj[[mx3-; N|"
         }
     }
     func testPerformanceObfuscatedString() {
-        self.measureBlock() {
+        self.measure() {
             var _ = TPObStr.z.curlyopenbracket.O.p.s.N.Y.circumflex.three.x.o.quote.minus.W.O.openbracket.k.lessthan.t.space.apostrophe.comma.at.I.four.A.closebracket.P.greaterthan.plus.zero.N.G.l.X.X.and.k.openparantheses.closeparantheses.backslash.t.equal.and.openbracket.hash.colon.t.h.colon.t.dot.W.b.dot.O.w.and.d.Q.equal.quote.a.o.i.at.s.greaterthan.N.two.underscore.J.lessthan.n.one.v.t.slash.i.openparantheses.v.D.e.a.K.m.X.one.T.j.openbracket.openbracket.m.x.three.minus.semicolon.space.N.pipe
         }
     }
@@ -54,13 +54,13 @@ func randomStringWithLength (len : Int) -> String {
     var result = ""
     for _ in 0..<len {
         let num = Int(arc4random_uniform(UInt32(max - min))) + min
-        result += String(Character(UnicodeScalar(num)))
+        result += String(Character(UnicodeScalar(num)!))
     }
     return result
 }
 
 func callMethod(method: String) -> String {
-    let methodParts = method.componentsSeparatedByString(".")
+    let methodParts = method.components(separatedBy: ".")
     var result = TPObStr
     for call in methodParts {
         if call == "zero" {
@@ -350,4 +350,4 @@ func callMethod(method: String) -> String {
         }
     }
     return result
-}
\ No newline at end of file
+}