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