Possible merge.

This is the same pull request as above, but I deleted that fork and made a new one, to make the changes less confusing.  First time issuing a pull request and forking a project.