Updates to work with mapping package
Changed the offset from map to base
Merge pull request #2 from JohanJohansson/master

Updates from Johan