Updated to match latest changes to strings
Merge pull request #115 from AngryLawyer/strbuf-to-string

Updated to match latest changes to strings