improve security listener
Merge pull request #4 from DavidBadura/security-improvement

improve security listener