Code

Merge branch 'ph/strbuf'