amr
repair code
merge with master
merged with ours
Merge pull request #8 from mohammed2049/Amr

Amr