Corrected logging setup
Merge branch 'devel' into david_misc