Changes for multigroup; fixes #575
Merge branch 'issue-575-multigroup'