Updated for Xcode6 DP3