Added groups
Merge pull request #203 from mvader/feature-groups

Added groups