move to stream2
Merge pull request #1 from calvinmetcalf/v2

move to stream2