New commit by Nour
Merge origin/master