Merge pull request #437 from leider/master

map now scalable