Moved the general listener back to the front of the line
Merge remote-tracking branch 'piecework/master'
Merge pull request #5 from pprestin/master

Reordering of general listener