Oops. generalize for default groups too
Merge pull request #44 from williecheong/staging

Oops. generalize for default groups too