[resolve the issue SAT-1379 22_nov]
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia