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