ALGORITMO 90%
Merge origin/master