Merge pull request #89 from Sriii/master

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

hasan to master