Groupable some changes
Merge pull request #55 from saulelis/groupables

Groupable some changes