Fixed map again
Merge branch 'develop' of https://github.com/bellevik/glory into develop