Updated history
Merge branch 'issue_8' into homologacao