Fix token
Merge branch 'master' into gh-pages
Generate deploy