Fix for XSS
Merge pull request #2 from albertshaw/master

Fix for XSS