[#16] incorporate Iván's comments