Added logging.
Merge branch 'master' into devel-logger
Finished off logging.