Merge pull request #550 from pedro-nonfree/master