Closing more streams
Merge pull request #337 from yaronyg/patch-4

Closing more streams