Groupables halfway done
Merge pull request #64 from saulelis/groupables

Groupables halfway done