Merge pull request #1 from pouriaMaleki/master

bug fix
Merge pull request #8 from MahyarJ/master

Merge pull request #1 from pouriaMaleki/master