Backwards compatibility tweaks #90
Merge pull request #1 from snoyberg/master

Backwards compatibility tweaks #90