Merge pull request #1 from AmirMoniri/master

Pull request