Updated for XCode 6.1 and iOS 8.1.1