sfvivek file
Merge pull request #1 from sfvivek/master

Important changes from sfvivek