Merge pull request #41 from bwhacks/security-fixes