Added support for IOS8