Resolve XSS. Close #61