Fix XSS vulnerability
Merge pull request #1 from TK-999/xss

Fix XSS vulnerability