Merge pull request #41 from museoXela/master

Merge Migue4
Merge pull request #259 from Migue4/master

Merge pull request #41 from museoXela/master