Jeff McGee

This didn't work for me, so I made a different pull request.

The patch did not work for me, so I wrote another one. The code is attached to the pull request in issue #14. My fork with just that one patch...