Implementing log
Merge branch 'logging'