#18 Added default logging