Merge pull request #26 from fpaut/security