Fixed (yet another) xss thing
Decided to fix the fix in a different fix
Merge pull request #247 from goehle/latestxss

Another xss fix