Minor fixes
Add website components
Merge branch 'master' into gh-pages
Publish website