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