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