my first pull request

Let's merge in the "second branch" edits.