Remove security issues
Merge pull request #61 from ShelvAR/dev

Remove security issues