Added iOS 8 Compatibility