First changes on ManuelPeinado lib