Merge pull request #7 from bsmith95610/master

merge
Merge pull request #10 from bsmith95610/test-branch

Merge pull request #7 from bsmith95610/master