Merge pull request #432 from dreid/blame-dreid

I guess I should take some of the blame.