Adding escaping to block XSS attacks
Merge pull request #1608 from ryanhellyer/adding-escaping

Adding escaping to block XSS attacks, props @ryanhellyer