Added the support for iOS 8