Additional whois servers
Merge remote-tracking branch 'origin/new_templates'