Merge pull request #13 from marekjm/streams