Added proper html escaping. Fixes #735