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