Merge pull request #223 from sipa/dnslookup