Update for widget & settings
Merge remote-tracking branch 'origin/master'