Closes #124
Merge branch 'enhancement-#124' into web