Merge pull request #65 from Sriii/Sri's-branch

sri to master
Merge pull request #66 from Sriii/master

master to sri