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