Changed logging according to #106