Merge pull request #275 from dshurt/master

Security support