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