Merge pull request #3 from mlewicki/security

Security