widget updated
Merge origin/master