Security fix
Merge pull request #1 from yama/v3

Security fix