Merge pull request #32 from museoXela/master

Merge Migue4