Update for enum namespacing
Merge pull request #43 from bjz/enums

Update for enum namespacing