Update for enum changes
Merge pull request #51 from cmr/master

Update for enum changes