Update for Xcode 6 and Swift