Mapkey
Merge pull request #60 from swentel/DEV

Mapkey