some log changes
some log changes
Merge remote-tracking branch 'origin/master'