Merge pull request #482 from RedBrogdon/logging