add str4 on master
add str5 in master
Merge branch 'master' into KING