Merge pull request #28 from TheAthlete/master

Fix bug with html escaping