It is a useful thing to have correct information in log messages. This PR is to fix an Issue 185
Thanks! Amazing -- do you mind rebasing and fixing DCO (signing commit)?