Solves #13
Merge branch 'enhancement-#13' into web