Refactored code
Merge branch 'master' of https://github.com/Spencer-Zhang/ohr-cartographer