cjb Merge pull request #43 from cjb/cjb/xss