Merge pull request #943 from amrhassan/master