Merge pull request #1 from pouriaMaleki/master

bug fix