Added support for grouping
Merge pull request #1 from SamirHafez/master

Added support for grouping