Merge pull request #24 from bluss/map

Feature bonanza