getMap edit
Merge branch 'master' of github.com:JenQian/butterfly3