diff --git a/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/wu.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/wu.xcuserdatad/UserInterfaceState.xcuserstate
index 5bd9d0d4..268f2397 100644
Binary files a/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/wu.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/wu.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/SwiftRadio.xcodeproj/xcuserdata/wu.xcuserdatad/xcschemes/xcschememanagement.plist b/SwiftRadio.xcodeproj/xcuserdata/wu.xcuserdatad/xcschemes/xcschememanagement.plist
index 322e71fa..fc800377 100644
--- a/SwiftRadio.xcodeproj/xcuserdata/wu.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/SwiftRadio.xcodeproj/xcuserdata/wu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,6 +12,11 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>2C5545B91C1124DE00728469</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>9409E1151ABF6FEA00312E2B</key>
 		<dict>
 			<key>primary</key>
diff --git a/SwiftRadio/AnimationFrames.swift b/SwiftRadio/AnimationFrames.swift
index 254441f1..f0895c0f 100755
--- a/SwiftRadio/AnimationFrames.swift
+++ b/SwiftRadio/AnimationFrames.swift
@@ -20,7 +20,7 @@ class AnimationFrames {
             }
         }
         
-        for (var i = 2; i > 0; i--) {
+        for i in 2.stride(to: 0, by: -1) {
             if let image = UIImage(named: "NowPlayingBars-\(i)") {
                 animationFrames.append(image)
             }
diff --git a/SwiftRadio/Base.lproj/Main.storyboard b/SwiftRadio/Base.lproj/Main.storyboard
index f957755e..e16c853f 100755
--- a/SwiftRadio/Base.lproj/Main.storyboard
+++ b/SwiftRadio/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kdl-ej-Zz5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kdl-ej-Zz5">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -29,7 +29,7 @@
                                         <rect key="frame" x="0.0" y="22" width="320" height="88"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hMr-La-1Ga" id="NhW-Qy-GCO">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="87"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="87.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="stationImage" translatesAutoresizingMaskIntoConstraints="NO" id="GQm-Mf-6pw">
diff --git a/SwiftRadio/Libraries/Spring/KeyboardLayoutConstraint.swift b/SwiftRadio/Libraries/Spring/KeyboardLayoutConstraint.swift
index 6232c938..c45532d9 100755
--- a/SwiftRadio/Libraries/Spring/KeyboardLayoutConstraint.swift
+++ b/SwiftRadio/Libraries/Spring/KeyboardLayoutConstraint.swift
@@ -33,7 +33,7 @@ public class KeyboardLayoutConstraint: NSLayoutConstraint {
         offset = constant
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(KeyboardLayoutConstraint.keyboardWillShowNotification(_:)), name: UIKeyboardWillShowNotification, object: nil)
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardWillHideNotification:", name: UIKeyboardWillHideNotification, object: nil)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(KeyboardLayoutConstraint.keyboardWillHideNotification(_:)), name: UIKeyboardWillHideNotification, object: nil)
     }
 
     deinit {
diff --git a/SwiftRadio/Libraries/Spring/Misc.swift b/SwiftRadio/Libraries/Spring/Misc.swift
index a2aa3274..2c47d0b5 100755
--- a/SwiftRadio/Libraries/Spring/Misc.swift
+++ b/SwiftRadio/Libraries/Spring/Misc.swift
@@ -142,7 +142,7 @@ public func randomStringWithLength (len : Int) -> NSString {
     
     let randomString : NSMutableString = NSMutableString(capacity: len)
     
-    for (var i=0; i < len; i++){
+    for _ in 0..<len {
         let length = UInt32 (letters.length)
         let rand = arc4random_uniform(length)
         randomString.appendFormat("%C", letters.characterAtIndex(Int(rand)))
diff --git a/SwiftRadio/Libraries/SwiftyJSON.swift b/SwiftRadio/Libraries/SwiftyJSON.swift
index 61423a35..051b6509 100755
--- a/SwiftRadio/Libraries/SwiftyJSON.swift
+++ b/SwiftRadio/Libraries/SwiftyJSON.swift
@@ -384,7 +384,7 @@ public struct JSONGenerator : GeneratorType {
         switch self.type {
         case .Array:
             if let o = self.arrayGenerate!.next() {
-                return (String(self.arrayIndex++), JSON(o))
+                return (String(self.arrayIndex += 1), JSON(o))
             } else {
                 return nil
             }