join group fixes
Merge pull request #159 from glenwks/master

join group fixes