Update for enum namespace change
Merge pull request #59 from csherratt/master

Update for enum namespace change