Updated for iOS SDK 8.1