Results 2 comments of fuzhibo

OK, I will update related code and then make a new pull request. Thanks, Zhibo

Ok, sounds good. I will try. :) Thanks, Zhibo