Bugfix
Merge branch 'groups' into testing