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