Merge pull request #13 from adorilson/development

Refactoring the evaluation package