Merge pull request #106 from Sriii/master

master to varshini
h
hm
hhh
conflict :(
Merge pull request #113 from Sriii/Varshini's-branch

Varshini's branch