Update for WAI 3.0.
Merge pull request #11 from clinty/master

Update for WAI 3.0.