Merge pull request #50 from museoXela/master

Merge Migue4
Merge pull request #277 from Migue4/master

Merge pull request #50 from museoXela/master