updated with Xcode6