Merge from twhittock:enum-groups
Merge pull request #259 from keent/master

Merge from twhittock:enum-groups