1.0.0 - rewrite to use streams2 and Buffers