Adding Chris's edits to the iOS SDK.