Security fix
Merge pull request #623 from Dzakus/patch-1

Security fix