minor update
Merge branch 'master' of https://github.com/jakalesmana/mobile-2nd
fix based on review by QA