Update to master (StrBuf)
Merge pull request #3 from cmr/master

Update to master (StrBuf)