Merge pull request #61 from Sriii/master

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

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

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

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

hasan to master