improve widget & bugfixes
brunched
Merge pull request #15 from aenario/master

improve widget & bugfixes