Merge pull request #20 from sambohler/master

Security Patch