third commit
Merge pull request #2 from jhitt/jrh/thirdedit

third commit