Committed to local branch
Merge pull request #10 from davoski/S-999666

Nathalie committing