Fix
confilt resolved
Merge pull request #12 from rezakhadjavi/master

conflicts resolved