Merge pull request #6 from doc-oc/master

Update Henry branch to latest
Merge pull request #7 from doc-oc/Henry

Merge pull request #6 from doc-oc/master