Map update
Merge branch 'master' of https://github.com/Gijs-W/hairy-bear