add log
Merge remote-tracking branch 'origin/log'
log cleanup