Adding support for multiple virtualhosts
Fixing conflicts