New version compatible with Xcode 6.1