Merge remote-tracking branch 'origin/master' into poonam-edits
#103 for mobile & pc

all fixed ready to test
Merge remote-tracking branch 'origin/poonam-edits'