Added vhost option
Merge branch 'dev'