Better streams
Merge pull request #331 from ryanseys/better-streams

Better streams