User added
finally a commit
Merge branch 'new-logging'
was merged by mistake