Restaurando master
Merge branch 'Gonher'
Restaurando master