Merge branch 'master' into gh-pages
Added assets to root
Merge branch 'gh-pages'