commit by yuyang at 20140610