Merge pull request #947 from ali1234/master