Merge pull request #429 from annando/smily-html