Revert #1; add option to only listen on subscribed streams
Merge pull request #2 from aripollak/only-subscribed-streams

Revert #1; add option to only listen on subscribed streams