Merge pull request #393 from nmav/no-group-match