Fixing issues with messages not being processed based on their multiple types.
Merge pull request #3 from bhaberer/master

Fixes Listeners, etc.