Rebase done
Correct rebase
Merge pull request #2 from zenorocha/base

Refactoring - logger was already defined with base.logger