Log improvements
Merge origin/master