Merge pull request #30 from Sriii/master

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

varshini to master