Merge branch 'pr/1' into gh-pages

Conflicts:
script.js