merge author's improvement

merge author's improvement