Truc fix map bug
Merge branch 'master' of https://github.com/RubikinTeam/map