Adding iOS 6 support