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