-- brahminder changed for some bugs.
Merge branch 'master' of github.com:desi-scratch/wrs