Merge remote-tracking branch 'origin/master' into poonam-edits
#110 n #112 fix for mobile
Merge remote-tracking branch 'origin/poonam-edits'