Merge pull request #3 from bhaberer/master

Fixes Listeners, etc.
Adding silly badges.