Shoot. This was painful.

Here's my first pull request.

Peter