Merge pull request #1 from zohararad/master

merge main project