Merge pull request #11 from profbruna/master

Genero