Fixes Bufferable to be safe
Merge pull request #78 from twitter/feature/better-bufferable

Fixes Bufferable to be safe