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