Issue #6: Small fixes on widget system
Merge remote-tracking branch 'origin/master'