diff --git a/Podfile.lock b/Podfile.lock
index 846d424a..5c6831e3 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -120,4 +120,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: c0d3ac6392c31961b5f3a0108501cdaf990069ee
 
-COCOAPODS: 1.7.2
+COCOAPODS: 1.6.0
diff --git a/Susi.xcodeproj/project.pbxproj b/Susi.xcodeproj/project.pbxproj
index ea7bb959..6b265990 100644
--- a/Susi.xcodeproj/project.pbxproj
+++ b/Susi.xcodeproj/project.pbxproj
@@ -792,24 +792,23 @@
 					6D215B911EB0BE7300CD2C1D = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = MLF4G8Y374;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6D4D9B361E768E190067459C;
 					};
 					6D4D9B361E768E190067459C = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = 7P4K4M8A4Q;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 6D4D9B321E768E190067459C /* Build configuration list for PBXProject "Susi" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 				ru,
@@ -1124,7 +1123,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = Susi;
 			};
 			name = Debug;
@@ -1143,7 +1142,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = Susi;
 			};
 			name = Release;
@@ -1287,7 +1286,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1313,7 +1312,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
diff --git a/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme b/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
index c8ae730c..60633023 100644
--- a/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
+++ b/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6D4D9B361E768E190067459C"
+            BuildableName = "Susi.app"
+            BlueprintName = "Susi"
+            ReferencedContainer = "container:Susi.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -45,17 +54,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6D4D9B361E768E190067459C"
-            BuildableName = "Susi.app"
-            BlueprintName = "Susi"
-            ReferencedContainer = "container:Susi.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"