StrBuf->String
Remove trailing whitespace
Merge pull request #161 from bjz/string

StrBuf->String