Back edit1
Merge pull request #1 from Raymondization/Back_edit1

Back edit1
Merge pull request #2 from Raymondization/master

back edit