Updated for Xcode6-Beta7