Merge pull request #32 from xenog/yesod

No more lookaheads