Merge pull request #7 from ckelman/wolf

I don't know what I'm doing