Streaming #3
Merge pull request #21 from gtklocker/streaming-3

Streaming #3