WAI 3.0 support
Merge pull request #39 from snoyberg/master

WAI 3.0 support