Merge pull request #3 from Sriii/master

master to hasan
Merge branch 'master' into Hasan's-branch
merge