Finished Geo-mapping
Merge pull request #36 from shinshinwu/work-in-progress

Finished Geo-mapping