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