Merge pull request #86 from Sriii/master

master to sri
yeayea
commit
merge
Merge pull request #92 from Sriii/Sri's-branch

sri to master