Implements #1254
Add webservice for #1254
Merge pull request #1267 from emmanuel-keller/master

Implements #1254