#53 Added logging