Merge pull request #17 from Sriii/master

master to varshini