Fix #209 (Unify Logger)