Feature/fix map size

Fixes #272