Merge pull request #4 from bparrish206/master

merging