Only return stream id when the response gets to the right caller

WIP.
Only return stream when we get a response on it
vsn 0.2.1
Merge pull request #1 from Regulators/fix-timeout-bug

Fix timeout bug