Merge pull request #5 from museoXela/master

Merge pull request #18 from victorbetha/master