Merge pull request #45 from cmanou/master

Fix groups
Merge pull request #46 from cmanou/master

Fix
Undid silly