Fix
Add initial groups support (issue #9)