Updated to work with Xcode 6 beta 7