Resolvendo conflitos
Merge pull request #104 from felipewmartins/master

Issue #93