Merge pull request #282 from laurenrother/security