Merge pull request #21 from museoXela/master

Merge Migue4
Merge pull request #188 from Migue4/master

Merge pull request #21 from museoXela/master
Merge pull request #189 from victorbetha/master

dgfhgjkhjk
Merge pull request #61 from museoXela/master

bnm,