These pass now, I believe.
Merge pull request #43 from alex/patch-1

These pass now, I believe.