Merge pull request #544 from M2Ys4U/whois-host