Updated to build for Xcode 6.1