Merge pull request #1 from alcidesv/master

Master