Style and security updated
Merge pull request #37 from obiba/style-security

Style and security updated