Feature 31 (maps)

Initial commit for maps
Merge pull request #12 from SvenLehmann/feature/#31

merge #31 into dev