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