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