add str4 on master
merge master 's new modify
merge to new master