Merge pull request #896 from echampet/webresource