Testing a pull request.
Merge pull request #40 from dansterrett/master

This is a test pull request.