Bug fixed: multiple call this widget per page doesn't work.
Merge remote-tracking branch 'origin/master'