Merge pull request #829 from abdelrahmanhosny/master