Merge pull request #3 from core9/master

merge back from master
Merge branch 'master' into develop
render widgets per vhost