Security fix + removal of unnecessary hook
Better fix
Merge pull request #1 from Drakulix/master

Security fix + little improvement