Broke out changes into ZStream.jl