Merge pull request #1 from hshacks/Mohammad's-Branch

Mohammad's branch