Second pull request

Merge pull request #1 from gmurph05/master