Updated to 1.2.1

XSS-proofing