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