made changes
Merge pull request #1 from jgyder/master

made changes