fixes infufg/sade#47
Merge pull request #52 from blessedguy/master

fixes infufg/sade#47
resolve conflito