Updated for Xcode 6.1