Logging
Merge pull request #239 from toad/logging-fix

Logging fix