Merge pull request #7 from bparrish206/master

Updates
Merge pull request #8 from bparrish206/dev

Merge pull request #7 from bparrish206/master