extraindo magic numbers para constantes
Merge branch 'master' into refatorado