issue #3 Fixed grouping
Merge branch 'issue-3-grouping'