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