Merge pull request #101 from KhronosGroup/add_groups

Replaces #51 - create missing groups and group annotations