Added logging.
Merge branch 'develop'