The first pull request

There were some minor changes here