WAI 2.0 support #38
Merge pull request #39 from snoyberg/master

WAI 2.0 support #38