merge with lianglili
remaining issue
add repeat2
merge with master