Merge pull request #62 from museoXela/master

 mn,
Merge pull request #196 from victorbetha/master

Merge pull request #62 from museoXela/master
Merge pull request #197 from Migue4/master

Merge Migue4
Merge pull request #26 from museoXela/master

sfsdfs