Merge pull request #233 from apprb/dev

Widget code cleanup