Added support for IOS 8