Aligning iOS message with Android's
Merge pull request #2 from wmathurin/ios_fixes

Aligning iOS message with Android's