Merge pull request #100 from paddatrapper/map

Map