Tried to fix map
Merge branch 'master' of https://github.com/Tarwine/hollow
Merge with origin