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