Some tweaks
Merge branch 'master' of github.com:miekg/dns