merge str3lib changes