Merge branch 'master' into gh-pages
Assets added
Merge branch 'gh-pages'