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