Updated for XCode 6.1