Add support for Buffers

Closes #5
else on its own line