Merge pull request #38 from Sriii/master

master to hasan
Merge pull request #44 from Sriii/master

master to hasan
Merge pull request #50 from Sriii/master

master to hasan
Merge pull request #59 from Sriii/Hasan's-branch

hasan to master