merge from LosingLin

get the newest coder