Issue 34 : Fix logging