Added more tests
Some updates
Refactor stream into channel
Merge pull request #28 from jaytaph/channel

Channel