Merge pull request #4 from leonardoaranda/master

Merge pull request #3 from leonardoaranda/beta
Merge pull request #5 from leonardoaranda/beta

Merge pull request #4 from leonardoaranda/master