Update web service
Merge pull request #619 from FHenry/develop

Update web service