removed HTML errors
Merge branch 'master' into develop