diff --git a/Swifternalization.xcodeproj/project.pbxproj b/Swifternalization.xcodeproj/project.pbxproj
index 5aa61d2..70b4b4b 100644
--- a/Swifternalization.xcodeproj/project.pbxproj
+++ b/Swifternalization.xcodeproj/project.pbxproj
@@ -31,7 +31,6 @@
 		6D5004541B3EF91600A54B36 /* Swifternalization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D5004481B3EF91600A54B36 /* Swifternalization.framework */; };
 		6D50045B1B3EF91600A54B36 /* SwifternalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D50045A1B3EF91600A54B36 /* SwifternalizationTests.swift */; };
 		6D5004661B3EF92600A54B36 /* Swifternalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5004641B3EF92600A54B36 /* Swifternalization.swift */; };
-		6D5004961B3EFFC100A54B36 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6D5004591B3EF91600A54B36 /* Info.plist */; };
 		6D5BA5F01B651796000D7E49 /* TranslationsLoaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5BA5EF1B651796000D7E49 /* TranslationsLoaderTests.swift */; };
 		6D5BA5F11B6517A6000D7E49 /* TranslationsLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB3CC731B5EBDA600A1220F /* TranslationsLoader.swift */; };
 		6D5BA5F31B651809000D7E49 /* LengthVariation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB3CC6A1B5EBDA600A1220F /* LengthVariation.swift */; };
@@ -384,7 +383,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Tomasz Szulc";
 				TargetAttributes = {
 					6D5004471B3EF91600A54B36 = {
@@ -429,7 +428,6 @@
 			files = (
 				6DD3B93B1B5ED35200C79EAC /* expressions.json in Resources */,
 				6DD3B93A1B5ED35200C79EAC /* base.json in Resources */,
-				6D5004961B3EFFC100A54B36 /* Info.plist in Resources */,
 				6DD3B93C1B5ED35200C79EAC /* pl.json in Resources */,
 				6D43BA1D1B8BBA270072DEA6 /* ru.json in Resources */,
 			);
@@ -562,6 +560,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -643,6 +642,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -663,6 +663,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -681,6 +682,7 @@
 				);
 				INFOPLIST_FILE = SwifternalizationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -694,6 +696,7 @@
 				);
 				INFOPLIST_FILE = SwifternalizationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/Swifternalization.xcodeproj/xcshareddata/xcschemes/Swifternalization.xcscheme b/Swifternalization.xcodeproj/xcshareddata/xcschemes/Swifternalization.xcscheme
index 6682de5..72cfae2 100644
--- a/Swifternalization.xcodeproj/xcshareddata/xcschemes/Swifternalization.xcscheme
+++ b/Swifternalization.xcodeproj/xcshareddata/xcschemes/Swifternalization.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:Swifternalization.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/Swifternalization.xcodeproj/xcshareddata/xcschemes/SwifternalizationTests.xcscheme b/Swifternalization.xcodeproj/xcshareddata/xcschemes/SwifternalizationTests.xcscheme
index f85f194..e36df4d 100644
--- a/Swifternalization.xcodeproj/xcshareddata/xcschemes/SwifternalizationTests.xcscheme
+++ b/Swifternalization.xcodeproj/xcshareddata/xcschemes/SwifternalizationTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,15 +48,18 @@
             ReferencedContainer = "container:Swifternalization.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -71,10 +74,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/Swifternalization/Info.plist b/Swifternalization/Info.plist
index c1596b7..58ee6a0 100644
--- a/Swifternalization/Info.plist
+++ b/Swifternalization/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Swifternalization/Regex.swift b/Swifternalization/Regex.swift
index b0857bb..dd89bac 100644
--- a/Swifternalization/Regex.swift
+++ b/Swifternalization/Regex.swift
@@ -23,7 +23,7 @@ final class Regex {
     class func matchInString(str: String, pattern: String, capturingGroupIdx: Int?) -> String? {
         var resultString: String?
         
-        let range = NSMakeRange(0, distance(str.startIndex, str.endIndex))
+        let range = NSMakeRange(0, str.startIndex.distanceTo(str.endIndex))
         regexp(pattern)?.enumerateMatchesInString(str, options: NSMatchingOptions.ReportCompletion, range: range, usingBlock: { result, flags, stop in
             if let result = result {
                 if let capturingGroupIdx = capturingGroupIdx where result.numberOfRanges > capturingGroupIdx {
@@ -46,7 +46,7 @@ final class Regex {
     :returns: `String` that matches pattern or nil.
     */
     class func firstMatchInString(str: String, pattern: String) -> String? {
-        if let result = regexp(pattern)?.firstMatchInString(str, options: .ReportCompletion, range: NSMakeRange(0, distance(str.startIndex, str.endIndex))) {
+        if let result = regexp(pattern)?.firstMatchInString(str, options: .ReportCompletion, range: NSMakeRange(0, str.startIndex.distanceTo(str.endIndex))) {
             return substring(str, range: result.range)
         }
         return nil
@@ -61,7 +61,7 @@ final class Regex {
     */
     class func matchesInString(str: String, pattern: String) -> [String] {
         var matches = [String]()
-        if let results = regexp(pattern)?.matchesInString(str, options: .ReportCompletion, range: NSMakeRange(0, distance(str.startIndex, str.endIndex))) {
+        if let results = regexp(pattern)?.matchesInString(str, options: .ReportCompletion, range: NSMakeRange(0, str.startIndex.distanceTo(str.endIndex))) {
             for result in results {
                 matches.append(substring(str, range: result.range))
             }
@@ -93,8 +93,8 @@ final class Regex {
     :returns: A string contained in `range`.
     */
     private class func substring(str: String, range: NSRange) -> String {
-        let startRange = advance(str.startIndex, range.location)
-        let endRange = advance(startRange, range.length)
+        let startRange = str.startIndex.advancedBy(range.location)
+        let endRange = startRange.advancedBy(range.length)
         
         return str.substringWithRange(Range(start: startRange, end: endRange))
     }
diff --git a/Swifternalization/TranslationsLoader.swift b/Swifternalization/TranslationsLoader.swift
index 20b3ec3..e73721c 100644
--- a/Swifternalization/TranslationsLoader.swift
+++ b/Swifternalization/TranslationsLoader.swift
@@ -57,7 +57,7 @@ final class TranslationsLoader {
         */
         if strings > 0 && dicts == 0 {
             let key = element.keys.first!
-            let toIndex = advance(key.startIndex, 1)
+            let toIndex = key.startIndex.advancedBy(1)
             return key.substringToIndex(toIndex) == "@" ? .WithLengthVariations : .WithExpressions
         } else if strings >= 0 && dicts > 0 {
             return .WithExpressionsAndLengthVariations
diff --git a/SwifternalizationTests/Info.plist b/SwifternalizationTests/Info.plist
index 90c39ea..8a04c4d 100644
--- a/SwifternalizationTests/Info.plist
+++ b/SwifternalizationTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tomaszszulc.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>