Updated for Xcode 6 Beta 4 Swift changes