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