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