Testar
Fixed conflicts
accepeted pull request