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