Submitted 1.4.1, fixes for iOS 5.1