map view updated
Fixing merge conflicts
Merge pull request #10 from nickmeehan/chris

Chris