Resolves #17
Merge branch 'bugfix-#17' into web