Merge pull request #37 from janthurau/master

Adds support for user groups