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