updated enums again
Merge pull request #240 from jcotrel/master

updated enums again