Merge pull request #84 from kaliman2014/master

Merge pull request #1 from museoXela/master
Merge pull request #2 from museoXela/master

Merge pull request #84 from kaliman2014/master