widget bug fixed and tested
Merge remote-tracking branch 'origin/new' into new