clases ghiz
Merge origin/master