Improve XSS Sniff

Closes #33