Streams

Fixes #393