Use logger for logging
directly access logger instead of log method
Merge branch 'logging'