Merge pull request #1 from groupserver/master

Latest and master