Here we go!
Map working better now
Merge pull request #1 from tomvantilburg/master

merge from Tom