Adding support for iOS 8