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