ultimos fixes
Merge pull request #4 from DiegoUX/fixesAndrea

ultimos fixes