#44 Added some logging