msg: --modify by sxchen at 11:13 on 3/10/2013--

this is master's commit