added xml formatter
merged local changes