My changes
Merge pull request #1 from smasterson/my-new-branch

My changes