Clean up stream handling
Merge pull request #948 from hneuer/streams

Clean up stream handling