Please review branch feature/XSS