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