Merge pull request #4 from jhwing/develop

Develop
add amap
update map
Merge pull request #4 from romeoxmfx/develop

Develop