Code review
Merge branch 'issue_7' into homologacao