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