Merge pull request #1 from TeamKuhl/develop

Develop
Merge pull request #2 from TeamKuhl/develop

small fixes
Add ListenerException
Enhance comments