Merge pull request #78 from museoXela/master

hgsd
Merge pull request #278 from victorbetha/master

Merge pull request #78 from museoXela/master