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