Testing with bash
StrBuf -> String
Merge branch 'master' into gh-pages-test