Merge pull request #921 from mohamed/master