Fixed potential security issues
Merge pull request #8 from samdark/xss-fixes

Fixed potential security issues