Merge pull request #1 from doc-oc/master

Merge downstream
stock
Merge pull request #8 from HenryLeRoux/master

Stock