Merge pull request #32 from museoXela/master

Merge pull request #93 from victorbetha/master
Merge pull request #96 from victorbetha/master

Merge pull request #32 from museoXela/master