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