Fix + AddedSomeEnums
Merge pull request #307 from Crigges/master

Fix + AddedSomeEnums