ajustes 1
Merge branch 'chris'