Group join fix
Merge pull request #156 from glenwks/master

Group join fix