Merge pull request #4 from paufsc/master

Fixed