Se agregan comentarios
Merge origin/master