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