Changed logging output conditionals - fix #37