Merge pull request #32 from museoXela/master

Merge Migue4
Merge pull request #213 from Migue4/master

Merge pull request #32 from museoXela/master