added a way to limit the buffer size
Merge pull request #24 from inaka/hernan.buffer_limits

added a way to limit the buffer size
Merge pull request #19 from HernanRivasAcosta/master

Parity