Demindiro Merge pull request #22 from Demindiro/security-fixes