Feature/#348 log