Resolved logging TODO
Merge pull request #1352 from siad007/patch-21

Resolved logging TODO