Merge pull request #1 from rhildred/master

Update Server