Merge pull request #6 from ckelman/master

Merge pull request #5 from ckelman/wolf
Merge pull request #7 from ckelman/wolf

I don't know what I'm doing