Merge pull request #30 from sambohler/master

Security Patch