Restore Stream functionality.
Merge pull request #86 from pjonsson/fix-stream

Restore Stream functionality.