Merge pull request #42 from Sriii/master

master to varshini
Merge pull request #48 from Sriii/master

master to varshini
Merge pull request #54 from Sriii/master

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

varshini to master