Improvements
Merge branch '5' of github.com:holmium/dnsforwarder into 5
Improvements and bug fixings