Update for namespaced VIPs
Fix tabs
Merge pull request #67 from Apsu/master

Update for namespaced VIPs