fixed CHANGES
merged master