Updated for Xcode 6.2