Fix Streams
Merge pull request #44 from kadu/master

Fix Streams