Test commit from dhana
inculded some fix as per vimal req.
Merge pull request #1 from bugcy013/master

Test commit from dhana