New fixes
Merge pull request #33 from vitorbritto/master

New fixes