modified master
merged the conflicts
Merge pull request #1 from ajayaswain/master

please merge