More groups support
Merge remote-tracking branch 'upstream/master'
Merge pull request #172 from elgreco84/master

More Group support