Merge pull request #40 from cmanou/master

Fix groups
Merge pull request #41 from cmanou/master

to json