Merge pull request #71 from Sriii/Varshini's-branch

Varshini to master
Merge pull request #72 from Sriii/master

master to varshini