Merge pull request #43 from bwhacks/security-fixes