Merge pull request #574 from pedro-nonfree/patch-2