hasegaw Merge pull request #10 from zakkie/fix/security_improve