Rework internal buffers handling to be extensible
Merge pull request #53 from tomaka/rework-buffers

Rework internal buffers handling to be extensible