Merge pull request #68 from wesbos/master

Fixed #66 and #67
fixing popup messages with trusted HTML