Improves the check if it should respond
Merge pull request #6 from terwey/listener

Improves the check if it should respond