fixes infufg/SADE#49
resolve conflito
Merge pull request #53 from luizhenriquees/master

fixes infufg/SADE#49