Merge pull request #64 from Sriii/master

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

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

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

master to marc