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