Closes #119
Merge branch 'enhancement#119' into web