Merge pull request #17 from Tenkiv/master

Revert buffer util removal.
Merge pull request #18 from Tenkiv/master

Reverts revert of buffer util removal