Merge pull request #37 from kareth/master

Add groups feature
fix bug in creating groups