fixes
mc
final commit
Merge branch 'master' of https://github.com/Fattouh92/src into omar