clear code
Merge branch 'widget'