more stuff
fix publish
Merge branch 'master' into gh-pages
publishing it