Merge pull request #1 from groupserver/master

Latest and master
Merge pull request #2 from groupserver/latest

Merge pull request #1 from groupserver/master