add tests
problems
commit inicial
master merge code
master merge tests
ajuste no codigo