fixes
Merge pull request #2 from mariush13/work

fixes