pull request fixes #1

branch edit