push from danielcalencar.git and some refactoring
Merge pull request #6 from danielalencar/master

Removing package evaluation.domain
The package 'domain' must be unique, not per feature