Updated for Xcode6.1-Beta