My second commit
Merge pull request #2 from mathewmcd/dev

My second commit