remove bufferStream option
Merge pull request #142 from jonathanong/remove-buffer-stream

remove bufferStream option
rebase
rebase fix