Merge pull request #825 from Qoyyuum/master