Updated after testing with Xcode 6.1