Fix for XSS issue #18 - closes issue #18