Just sending the same patch but rebase with current master (it was brokenfor gram.y after new commits).
Best regards,