05 fix logging
06 merge