fixed bug with html comments
Merge branch 'dev'