WAI 3.0
Merge pull request #12 from snoyberg/master

WAI 3.0 #11