Merge pull request #8 from leonardoaranda/master

Merge pull request #7 from leonardoaranda/beta