ok I think it's a good idea to leave it for PR 189.

So do you see something else missing to complete #52 and #93 ?