Fixes #87

Fixes #87
Improves logging output