Merge pull request #6 from doc-oc/master

Update Henry branch to latest