second commit
Merge pull request #1 from mrezai/master

second commit