third commit by kingsly
Merge https://github.com/madhangit/mobile