Jonathan Carter's pull request

Here's my shot at this.  And my contact info is:

Jonathan Carter
borkabrak@gmail.com
615.293.9673