removed some magic numbers and refatored classes
Merge branch 'master' of https://github.com/Thiagokairala/TecProg