Issue #111 and #112

This changes address the refactoring of the logger.