Merge pull request #42 from museoXela/master

Merge Migue4
Merge pull request #261 from Migue4/master

Merge pull request #42 from museoXela/master