Small changes
resolved conflicts
Merge pull request #8 from anuradha1992/master

Some modifications