logger.info -> logger.log
Merge remote-tracking branch 'origin/master'