Add/Fix

* some skeletal ideas around how to take an input stream and split it out to multiple clients
Merge remote-tracking branch 'origin/master'