Merge pull request #1 from kguischard13/master

updates