Fixes #27 & #28 and some additions to Buffers