Merge pull request #101 from hC4stillo/master

Merge pull request #12 from museoXela/master