Add logging support
Merge branch 'logging'

* logging:
  Add logging support