5th pull request.
Merge pull request #5 from bmayes/test2

5th pull request.