Merge pull request #3 from bradbishop/enumerate

Mapper refactoring