Merge pull request #42 from museoXela/master

Merge pull request #131 from victorbetha/master
Merge pull request #135 from victorbetha/master

Merge pull request #42 from museoXela/master