Fixed EchoLogger.
Merge origin/master