Closes #32
Merge branch 'bugfix-#32' into web
Merge commit '8c7342f' (properly pulled branch web) into enhancement-#24