Up to date with master (StrBuf->String)