Enums.... round three
Merge pull request #1600 from tduehr/enums

Enums.... round three