Merge pull request #34 from museoXela/master

Merge Migue4