Security Manager - minor refactoring, Simple security manager
Merge pull request #118 from dlu-gs/feature/security-manager

Security Manager - minor refactoring, Simple security manager