Updated to work with iOS 7.0