first draft complete'
First Draft
Merge branch 'master' into gh-pages