join group
fix conflicts
Merge pull request #41 from RenchuSong/master

join group