Merge pull request #1 from core9/develop

fix widget options
Merge branch 'develop'
Merge pull request #2 from core9/develop

Develop
Merge pull request #3 from core9/master

merge back from master