Closes #68
Merge branch 'bugfix-#68' into web