Merge pull request #120 from andrecrash3r-pt/patch-1