StrBuf -> String, and a minor fix-up.
Merge pull request #14 from FreeFull/master

StrBuf -> String, and a minor fix-up.