Merge pull request #9 from bparrish206/master

merging
Merge pull request #10 from bparrish206/dev

Merge pull request #9 from bparrish206/master