This version fixes some security issues.

Let me know if there are any issues.