merge author's commit

merge author's commit ~~~~~~~~