Merge pull request #3 from payam10/master

fixed merge conflict I think
Merge pull request #4 from payam10/master

fixed again