Few issues fixed
Merge branch 'master' of https://github.com/sonal-swarnima/baadal2.0