Merge pull request #16 from levfurtado/tp

Tp