Merge pull request #10 from hugodes/buffer

Buffer