Merge pull request #72 from museoXela/master

Merge pull request #239 from victorbetha/master
asdfa

sdfas
Merge pull request #240 from victorbetha/master

zvbcz