Merge pull request #39 from museoXela/master

Merge Migue4
Consolidaciones

Mejoras
Merge pull request #253 from Migue4/master

Merge Migue4