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