Merge pull request #8 from museoXela/master

Merge pull request #129 from Migue4/master
Merge pull request #130 from Migue4/master

Merge pull request #8 from museoXela/master