ajustes 24-07
Merge branch 'andre'