updated enums
updated enums
Merge pull request #236 from jcotrel/master

updated enums