Merge branch 'centralize-group-factory-choice' into 'master'

Centralize decision on group factories (thanks @eshoag2 for the idea) (Fixes #6 on gitlab)

Closes #6

See merge request !13