Merge pull request #17 from Sriii/master

master to varshini
Merge pull request #24 from Sriii/Varshini's-branch

Merge pull request #17 from Sriii/master