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