More appropriate logging controls
Merge pull request #455 from theopolis/feature-understandable-logging

More appropriate logging controls