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..4202106 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,9 @@ class TPObfuscatedStringConverter {
                 result.append(String(c))
                 break
             case 48...57:
-                result.append(formatter.stringFromNumber(Int(String(c))!)!)
+                let charNum = NSNumber(integerLiteral: Int(String(c))!)
+                let str = formatter.string(from: charNum)!
+                result.append(str)
                 break
             case 32:
                 result.append("space")
@@ -131,8 +133,8 @@ class TPObfuscatedStringConverter {
                 break
             }
         }
-        return result.joinWithSeparator(".")
+        return result.joined(separator: ".")
     }
     
     
-}
\ No newline at end of file
+}