Some fixes
More fixes
Fixed conflicts
Fixed conflicts
Fixes
Fixes
Fixes
Fixes
Fixes
Final
Merge pull request #617 from alaashafaee/Demo_Khaled

Demo_Khaled