Update server version
Merge pull request #1 from gcharvin/server-version

Update master branch from server version, adding changes made by Camille Paoletti