Merge pull request #14 from museoXela/master

Merge pull request #42 from victorbetha/master