Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Home page WIP
Small refactor
Merge branch 'gh-pages'