Merge branch 'hotfix/0.1.16' into gh-pages
+ 0.1.18   minor fixes to the HTML files
Merge branch 'hotfix/0.1.18' into develop