Merge pull request #6 from museoXela/master

hugo
Merge pull request #25 from victorbetha/master

Merge pull request #6 from museoXela/master