Added support for iOS8