Merge pull request #3 from gaoyuanvision/new_edit

New edit