Merge pull request #58 from museoXela/master

Merge pull request #182 from victorbetha/master