lots of modifications, tests passing
Merge branch 'master' of github.com:/queirozfcom/rachinations