Logging refactoring merge for version 0.2.1