Added support for buffers. v0.0.3