Merge pull request #69 from bxl1989/master

fix bug?
Merge pull request #70 from bxl1989/master

after addplan back to
map support
fix conflicts
Merge pull request #47 from roselone/master

map