Merge pull request #46 from museoXela/master

Merge pull request #266 from Migue4/master
Merge pull request #268 from Migue4/master

Merge pull request #46 from museoXela/master