ajustes 5-7
Merge branch 'andre'
compile