Commit based on PR #10 to standardise use of variables in group names