Merge pull request #7 from bparrish206/master

Updates