some changes
Merge pull request #1 from mariush13/work

some changes