Use Edit link on Github to simplify pull request procedure
Merge branch 'master' into edit-link