Merge pull request #72 from Sriii/master

master to varshini
nn
gg
hi
Merge pull request #77 from Sriii/Varshini's-branch

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

master to marc