WAI 3.0
Merge pull request #68 from snoyberg/master

WAI 3.0