Polished the code and corrected all warnings
Merge branch 'master' of https://github.com/H4313/mapp