changed how stream is injected.
Merge branch 'pull1' into fork1