Added check for groups
Merge pull request #12 from DVassilev/patch-11

Added check for groups