Merge pull request #3 from stdrickforce/map

Map