[refactor] adjusted to new Group.Builder
Merge pull request #52 from davidmoebius/OSNG-312

[refactor] adjusted to new Group.Builder