Refactor Map Info
Merge branch 'master' of https://github.com/tranvictor/landlord