Hossam's Change
Merge pull request #50 from ndomar/hossam

Hossam's Change