Merge pull request #46 from Sriii/master

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

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

sri to master