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