Merge pull request #579 from pedro-nonfree/patch-3