Merge branch 'pr/37'

Conflicts:
main.js
package.json