updated log archiver
merged master, resolved conflicts