Merge pull request #1 from leonardoaranda/beta

minor changes
Merge pull request #2 from leonardoaranda/master

Merge pull request #1 from leonardoaranda/beta