Copyright
Copyright Declum
Improvements
Commit
Merge pull request #1 from declum/new-listener-framework

New listener framework