My changes?
Merge pull request #31 from mreist/jays_branch

My changes?