map
Merge pull request #3 from Jusliang/master

map display