Merge pull request #45 from museoXela/master

asdxfvcbnm,
Merge pull request #142 from victorbetha/master

Merge pull request #45 from museoXela/master