Merge pull request #1 from gmurph05/master

pulled all