Merge pull request #995 from Diapolo/master