Rebase went wrong and XSS was reopened
Merge pull request #20 from rgmccaw/master

Rebase went wrong and XSS was reopened