For me it's OK. 
@jygaulier : Please ping me for merging this one when romain's comment would be taken into account.