Renamed to group and context.
Merge pull request #1 from jrfaller/master

Renamed to group and context.