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