Truncate html properly
Merge branch 'dev'