Merge pull request #4 from wlgys8/master

update from wlgys8
Merge pull request #5 from wlgys8/master

update from wlgys8
Merge pull request #6 from wlgys8/master

update from wlgys8
map create update

map create update
Merge pull request #3 from waiter/master

map create update