Refactor Reports
Merge pull request #25 from oscmejia/new/refactor-reports

Refactor Reports