merge logging #66

Closed anikard closed 7 years ago