Merge pull request #35 from museoXela/master

Merge Migue4