Merge pull request #87 from victorbetha/master

Merge pull request #29 from museoXela/master
Merge pull request #30 from museoXela/master

Merge pull request #87 from victorbetha/master