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