allow no group_by
Merge branch 'no_group_by' into team
0.2.2