keefertaylor Merge pull request #215 from keefertaylor/logging_update