Logger Added
Merge origin/master
Test fixed