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