Merge branch 'better_logging' into master