another commit
Merge pull request #34 from msmith7904/matthew_branch

another commit