Added logging facility.
Merge branch 'add-logging'