changes that corey made
Merge pull request #64 from mjsteichen/coreys-changes

changes that corey made