so merging
fixed merge conflicts
Merge pull request #6 from zsweedyk/map

Map