merged latest master from Carles Barrobés i Meix