Fixes #28 #27 + Map bounds.
Merge pull request #31 from steffel/dev

Fixes #28 #27 + Map bounds.