fix dependencies
upgrade deps
Merge branch 'master' into gh-pages
deploy