commit by yuyang at 20140611