allow more html tags & attributes
Merge pull request #125 from houke/master

Allow more html tags & attributes