Improved map object transfer
Merge branch 'master' of https://github.com/fast4y/Ninjaes