Davide D'Alto yeah, I saw that but considering the situation of Yahoo, I don't think it's a good idea to rely on it.
I pushed a PR following the idea Emmanuel had. It shouldn't be a lot of extra work to finish it.