Merge pull request #11 from samoth93/bugs_1.x

Fix forgotten htmlentities for compatibility with PHP5.4