La correcntion bugs
Merge origin/master