Got a bit furter on the DNS listener
Merge remote-tracking branch 'origin/master'