split out logger for more flexible logging output
Merge remote-tracking branch 'origin/master'