redo
Merge pull request #1 from jmeyer625/master

redo