Merge pull request #2 from gmurph05/master

Second pull request