Merge pull request #550 from andreamaiolo/master