Changes suggested by kuldeep.
Merge branch 'master' of https://github.com/jadav1982/Liki.NisysDev