Basic map view working
Merge pull request #13 from timlinux/develop

Basic map view working