revise and enable logging
revise and enable logging
revise and enable logging
revise and enable logging
revise and enable logging
revise and enable logging
change to use logger instead of console
Merge remote-tracking branch 'upstream/master'