Added setLogger
Merge conflict fix
Implemented NullLogger