Merge pull request #2 from cmr/master

Lots of fixes
Update to master (StrBuf)