commit
commit
Merge branch 'master' into new-jump
Merge pull request #40 from moyoron64/new-jump

commit
Merge branch 'master' into fixMiniMap2