Logging mechanism fix
Merge pull request #2 from KevinVdV/DS-1623

Logging mechanism fix