Added iOS8 support