Merge pull request #9 from bparrish206/master

merging