SafeLogger implemented
Merge branch 'refactor' into newhostheadercheck