fixes #25

additionally: improved overall logging