Merge pull request #1431 from esdrubal/enummap