Issue #202: add logging
Merge branch 'issue_202'