MerleMoqueur

> Do you guys think this is ready to merge? It seems there will be no more comments on this, so I gess it’s ready to merge.