Merge pull request #146 from georgegui/master

Add options for group_rows