Merge pull request #926 from giuspen/master