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