Merge pull request #100 from danielrichman/master

Work around recently-released-dataset issues