new changes
Merge pull request #4 from JSchwag/jeff

new changes