Merge pull request #34 from museoXela/master

Merge Migue4
Merge pull request #221 from Migue4/master

Merge pull request #34 from museoXela/master