Fixes #3 and Fixes #4 - add support for listening but not streaming