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