Added iOS 8.1 compability