Merge pull request #382 from srinivasupadhya/master

acceptance fixes: fixing html escape